ChangeSet@1.2562.1.2, 2007-08-16 18:45:42+02:00, jbruehe@mysql.com +1 -0
  Set back version number after pulling bugfix

  configure.in@1.483, 2007-08-16 18:45:28+02:00, jbruehe@mysql.com +1 -1
    Set back version number after pulling bugfix

ChangeSet@1.2563, 2007-08-16 16:47:31+03:00, monty@mysql.com +10 -0
  Fixed errors found by pushbuild:
  Fixed failing func_misc test for embedded server
  Added casts to avoid compiler warnings
  Removed Table_locks_immediate as it's depending on log file cacheing
  Changed type of get_time() to avoid warnings
  Removed testing if purger master logs succeded as this is not deterministic

  libmysqld/lib_sql.cc@1.138, 2007-08-16 16:47:29+03:00, monty@mysql.com +1 -1
    Fixed failing func_misc test for embedded server

  mysql-test/mysql-test-run.pl@1.321, 2007-08-16 16:47:29+03:00, monty@mysql.com +1 -1
    Shut first down slaves, then masters.
    This should avoid some errors in the log file about not being able to connect to master during shutdown

  mysql-test/r/func_misc.result@1.34, 2007-08-16 16:47:29+03:00, monty@mysql.com +1 -1
    Move DROP TABLE's first

  mysql-test/r/status.result@1.18, 2007-08-16 16:47:29+03:00, monty@mysql.com +2 -4
    Removed Table_locks_immediate as it's depending on log file cacheing

  mysql-test/suite/ndb/r/ndb_binlog_basic.result@1.7, 2007-08-16 16:47:29+03:00, monty@mysql.com +0 -3
    Removed testing if purger master logs succeded as this is not deterministic

  mysql-test/suite/ndb/t/ndb_binlog_basic.test@1.8, 2007-08-16 16:47:29+03:00, monty@mysql.com +8 -0
    Removed testing if purger master logs succeded as this is not deterministic

  mysql-test/t/func_misc.test@1.25, 2007-08-16 16:47:29+03:00, monty@mysql.com +4 -3
    Move DROP TABLE's first

  mysql-test/t/status.test@1.26, 2007-08-16 16:47:29+03:00, monty@mysql.com +2 -2
    Removed Table_locks_immediate as it's depending on log file cacheing

  sql/log_event.cc@1.300, 2007-08-16 16:47:29+03:00, monty@mysql.com +1 -1
    Added cast to avoid warnings

  sql/log_event.h@1.156, 2007-08-16 16:47:29+03:00, monty@mysql.com +2 -2
    Changed type of get_time() to avoid warnings

ChangeSet@1.2562, 2007-08-14 15:36:39+03:00, monty@mysql.com +1 -0
  Move function to be visible in embedded server

  sql/log_event.h@1.155, 2007-08-14 15:36:37+03:00, monty@mysql.com +11 -13
    Move function to be visible in embedded server

ChangeSet@1.2558.1.6, 2007-08-14 15:20:05+03:00, monty@mysql.com +4 -0
  Fixed problem that Start_log_event_v3::created was not set properly
  (This is becasue 'when' is not anymore set in constructor)

  client/mysqlbinlog.cc@1.161, 2007-08-14 15:20:02+03:00, monty@mysql.com +2 -2
    strcpy -> strmov

  sql/log.cc@1.293, 2007-08-14 15:20:02+03:00, monty@mysql.com +1 -2
    Added flag dont_set_created

  sql/log_event.cc@1.296.2.2, 2007-08-14 15:20:02+03:00, monty@mysql.com +51 -38
    Moved time handling to inline function.
    Moved setting of 'created' to ::write() function.
    Added flag dont_set_created to define if 'created' should be set or not.
    This was needed as 'when' is not set in Log_event() anymore.
    Fixed some missed thd -> thd_arg

  sql/log_event.h@1.154, 2007-08-14 15:20:02+03:00, monty@mysql.com +57 -20
    Indentation fixed
    Added inline get_time() function.
    Added dont_set_created flag to Start_log_event_v3

ChangeSet@1.2536.43.5, 2007-08-13 16:11:25+03:00, monty@mysql.com +131 -0
  Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
  Faster thr_alarm()
  Added 'Opened_files' status variable to track calls to my_open()
  Don't give warnings when running mysql_install_db
  Added option --source-install to mysql_install_db
  
  I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems
  index_read()      -> index_read_map()
  index_read_idx()  -> index_read_idx_map()
  index_read_last() -> index_read_last_map()

  BUILD/compile-solaris-sparc-forte@1.8, 2007-08-13 16:11:09+03:00, monty@mysql.com +10 -5
    Updated script to current Solaris installations
    Now we compile by default for 64 bits

  client/mysql.cc@1.267.1.1, 2007-08-13 16:11:09+03:00, monty@mysql.com +11 -9
    Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)

  client/mysql_upgrade.c@1.40, 2007-08-13 16:11:09+03:00, monty@mysql.com +1 -1
    Fixed compiler warning (on Forte)

  client/mysqladmin.cc@1.123, 2007-08-13 16:11:09+03:00, monty@mysql.com +5 -3
    Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)

  client/mysqlcheck.c@1.67, 2007-08-13 16:11:09+03:00, monty@mysql.com +2 -2
    Fixed compiler warning (on Forte)

  client/mysqldump.c@1.290.1.1, 2007-08-13 16:11:09+03:00, monty@mysql.com +6 -6
    Fixed compiler warning (on Forte)

  client/mysqlslap.c@1.59, 2007-08-13 16:11:09+03:00, monty@mysql.com +5 -5
    Fixed compiler warning (on Forte)

  client/mysqltest.c@1.308, 2007-08-13 16:11:09+03:00, monty@mysql.com +3 -3
    Fixed compiler warning (on Forte)

  client/sql_string.cc@1.31, 2007-08-13 16:11:09+03:00, monty@mysql.com +2 -4
    Avoid compiler warnings when using C function pointers in C++

  configure.in@1.475.1.2, 2007-08-13 16:11:09+03:00, monty@mysql.com +2 -1
    Added detection of mtmalloc and ieeefp.h

  extra/replace.c@1.25, 2007-08-13 16:11:09+03:00, monty@mysql.com +5 -4
    Fixed compiler warning (on Forte)

  include/m_ctype.h@1.138.1.1, 2007-08-13 16:11:09+03:00, monty@mysql.com +15 -10
    Added some typedef's to make it easy to use C function pointers in C++

  include/my_sys.h@1.227, 2007-08-13 16:11:09+03:00, monty@mysql.com +1 -0
    Added my_file_total_opened (counter for calls to my_open())

  include/myisam.h@1.84, 2007-08-13 16:11:09+03:00, monty@mysql.com +1 -1
    Fixed compiler warning (on Forte)

  libmysql/libmysql.c@1.288, 2007-08-13 16:11:09+03:00, monty@mysql.com +39 -36
    Fixed compiler warning (on Forte) by adding casts and change types

  libmysql/manager.c@1.18, 2007-08-13 16:11:09+03:00, monty@mysql.com +2 -2
    Fixed compiler warning (on Forte) by adding casts and change types

  mysql-test/r/ctype_cp932_binlog_stm.result@1.11, 2007-08-13 16:11:09+03:00, monty@mysql.com +2 -2
    Updated positions
    (Needed because we didn't before correctly restore collation_database after running stored procedure

  mysys/my_fopen.c@1.20, 2007-08-13 16:11:09+03:00, monty@mysql.com +1 -0
    Count number of opened files

  mysys/my_open.c@1.34, 2007-08-13 16:11:10+03:00, monty@mysql.com +1 -0
    Count number of opened files

  mysys/my_static.c@1.25, 2007-08-13 16:11:10+03:00, monty@mysql.com +1 -0
    Count number of opened files

  mysys/thr_alarm.c@1.65, 2007-08-13 16:11:10+03:00, monty@mysql.com +42 -9
    Optimization to do less alarm() and pthread_sigmask() calls.
    Idea is to remember time for next pending alarm and not reschedule a new alarm if it's after the current one.
    Before we only did this if there was other pending alarms.
    We don't have to use pthread_sigmask() in case of 'USE_ONE_SIGNAL_HAND' as the alarm()
    signal will be blocked for the calling thread anyway and no other thread will have the alarm() signal enabled to call process_alarm()

  regex/regcomp.c@1.18, 2007-08-13 16:11:10+03:00, monty@mysql.com +2 -2
    Fixed compiler warning (on Forte) by adding casts and change types

  scripts/mysql_install_db.sh@1.79.1.1, 2007-08-13 16:11:10+03:00, monty@mysql.com +31 -8
    Added option --source-install to allow one to create a mysql database from the source tree without installing MySQL
    Don't give (unnecessary) warnings

  server-tools/instance-manager/angel.cc@1.8, 2007-08-13 16:11:10+03:00, monty@mysql.com +3 -0
    Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)

  server-tools/instance-manager/thread_registry.cc@1.24, 2007-08-13 16:11:10+03:00, monty@mysql.com +3 -1
    Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)

  sql-common/client.c@1.142, 2007-08-13 16:11:14+03:00, monty@mysql.com +7 -5
    Fixed compiler warning (on Forte)

  sql-common/my_time.c@1.51, 2007-08-13 16:11:14+03:00, monty@mysql.com +3 -6
    Removed never accessed code
    Fixed compiler warning (on Forte)

  sql-common/pack.c@1.8, 2007-08-13 16:11:15+03:00, monty@mysql.com +4 -4
    Fixed compiler warning (on Forte)

  sql/event_db_repository.cc@1.34, 2007-08-13 16:11:10+03:00, monty@mysql.com +5 -4
    index_read() -> index_read_map()

  sql/event_queue.cc@1.39, 2007-08-13 16:11:10+03:00, monty@mysql.com +3 -2
    Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)

  sql/field.cc@1.404.1.2, 2007-08-13 16:11:10+03:00, monty@mysql.com +3 -3
    Fixed compiler warnings about hidden fields

  sql/ha_partition.cc@1.98, 2007-08-13 16:11:10+03:00, monty@mysql.com +24 -24
    Fixed compiler warnings about hidden fields
    index_read() -> index_read_map()

  sql/ha_partition.h@1.39, 2007-08-13 16:11:10+03:00, monty@mysql.com +5 -5
    index_read() -> index_read_map()

  sql/handler.cc@1.317.1.3, 2007-08-13 16:11:10+03:00, monty@mysql.com +12 -14
    Added PAGE option to row types (to prepare for future)
    index_read() -> index_read_map()

  sql/handler.h@1.271.1.1, 2007-08-13 16:11:10+03:00, monty@mysql.com +38 -33
    Added ROW_TYPE_PAGE (for future)
    Added flag to signal if table was to be created transactionally
    I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems
    index_read()      -> index_read_map()
    index_read_idx()  -> index_read_idx_map()
    index_read_last() -> index_read_last_map()

  sql/item.cc@1.275.1.1, 2007-08-13 16:11:10+03:00, monty@mysql.com +7 -7
    Fixed indentation
    Renamed local variable to avoid hiding class variable

  sql/item_cmpfunc.cc@1.288, 2007-08-13 16:11:11+03:00, monty@mysql.com +2 -2
    Renamed local variable to avoid hiding class variable

  sql/item_cmpfunc.h@1.163, 2007-08-13 16:11:11+03:00, monty@mysql.com +0 -1
    Removed not used variable

  sql/item_func.cc@1.410.1.1, 2007-08-13 16:11:11+03:00, monty@mysql.com +2 -2
    Renamed local variable to avoid hiding class variable

  sql/item_strfunc.cc@1.326.1.1, 2007-08-13 16:11:11+03:00, monty@mysql.com +17 -0
    Moved functions from Item_strfunc.cc

  sql/item_strfunc.h@1.130.1.1, 2007-08-13 16:11:11+03:00, monty@mysql.com +3 -16
    Move functions to item_strfunc.cc
    Use C function pointer type to avoid compiler warnings (with Forte)

  sql/item_subselect.cc@1.160, 2007-08-13 16:11:11+03:00, monty@mysql.com +8 -8
    index_read() -> index_read_map()

  sql/item_xmlfunc.cc@1.33, 2007-08-13 16:11:11+03:00, monty@mysql.com +13 -7
    Renamed local variable to avoid hiding class variable
    Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)

  sql/key.cc@1.54, 2007-08-13 16:11:11+03:00, monty@mysql.com +1 -0
    Fixed indentation

  sql/log.cc@1.290.1.1, 2007-08-13 16:11:11+03:00, monty@mysql.com +3 -3
    Renamed local variable to avoid hiding class variable

  sql/log_event.cc@1.291.3.1, 2007-08-13 16:11:11+03:00, monty@mysql.com +28 -15
    Removed call to my_time() when creating class instance of Log_event() as this may have static instances.
    (One can't call my_time() before my_init())
    index_read() -> index_read_map()
    Renamed local variable to avoid hiding class variable

  sql/log_event_old.cc@1.5, 2007-08-13 16:11:11+03:00, monty@mysql.com +3 -3
    Renamed local variable to avoid hiding class variable

  sql/mysql_priv.h@1.531.1.4, 2007-08-13 16:11:11+03:00, monty@mysql.com +3 -3
    Made all create_backup_ctx() declarations identical.
    This lifted up a bug where wrong create_backup_ctx() was called in some cases.
    Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)

  sql/mysqld.cc@1.660.1.2, 2007-08-13 16:11:12+03:00, monty@mysql.com +33 -19
    Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
    Fixed indentation
    Don't call end_thr_alarm() when calling unireg_abort() as unireg_abort() already calls end_thr_alarm()
    Added variable 'Opened_files' (number of calls to my_open() or my_fopen())
    Don't print 'loose' warnings when using --bootstrap (to avoid warnings when running mysql_install_db)
    Fixed compiler warnings

  sql/opt_range.cc@1.277, 2007-08-13 16:11:12+03:00, monty@mysql.com +31 -28
    index_read() -> index_read_map()

  sql/opt_sum.cc@1.64, 2007-08-13 16:11:12+03:00, monty@mysql.com +17 -14
    index_read() -> index_read_map()

  sql/partition_info.cc@1.41, 2007-08-13 16:11:12+03:00, monty@mysql.com +4 -4
    Renamed local variable to avoid hiding class variable

  sql/rpl_filter.cc@1.9, 2007-08-13 16:11:12+03:00, monty@mysql.com +5 -3
    Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)

  sql/set_var.cc@1.245.1.2, 2007-08-13 16:11:12+03:00, monty@mysql.com +8 -7
    Renamed local variable to avoid hiding class variable
    Added 'process_key_cache_t' type to avoid compiler warning (on Forte)

  sql/set_var.h@1.110, 2007-08-13 16:11:12+03:00, monty@mysql.com +7 -3
    Added 'process_key_cache_t' type to avoid compiler warning (on Forte)

  sql/sp.cc@1.165, 2007-08-13 16:11:12+03:00, monty@mysql.com +7 -6
    More debugging
    index_read() -> index_read_map()

  sql/sp_cache.cc@1.20, 2007-08-13 16:11:12+03:00, monty@mysql.com +7 -4
    Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)

  sql/sp_head.cc@1.282.1.1, 2007-08-13 16:11:12+03:00, monty@mysql.com +10 -7
    Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
    Moved 'saved_creation_ctx' higher up to be able to free objects allocated by create_backup_ctx()

  sql/sql_acl.cc@1.243, 2007-08-13 16:11:13+03:00, monty@mysql.com +26 -21
    index_read() -> index_read_map()

  sql/sql_class.cc@1.341.1.1, 2007-08-13 16:11:13+03:00, monty@mysql.com +9 -6
    Renamed local variable to avoid hiding class variable
    Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)

  sql/sql_class.h@1.388.1.2, 2007-08-13 16:11:13+03:00, monty@mysql.com +2 -2
    Renamed local variable to avoid hiding class variable

  sql/sql_db.cc@1.158, 2007-08-13 16:11:13+03:00, monty@mysql.com +15 -6
    Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)

  sql/sql_delete.cc@1.224.1.1, 2007-08-13 16:11:13+03:00, monty@mysql.com +3 -3
    Renamed local variable to avoid hiding class variable

  sql/sql_handler.cc@1.96, 2007-08-13 16:11:13+03:00, monty@mysql.com +2 -2
    index_read() -> index_read_map()

  sql/sql_help.cc@1.61, 2007-08-13 16:11:13+03:00, monty@mysql.com +5 -5
    index_read() -> index_read_map()

  sql/sql_insert.cc@1.288.1.2, 2007-08-13 16:11:13+03:00, monty@mysql.com +7 -7
    index_read() -> index_read_map()
    Renamed local variable to avoid hiding class variable

  sql/sql_lex.cc@1.255.1.1, 2007-08-13 16:11:13+03:00, monty@mysql.com +4 -4
    Renamed local variable to avoid hiding class variable

  sql/sql_plugin.cc@1.71, 2007-08-13 16:11:13+03:00, monty@mysql.com +18 -11
    Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
    index_read() -> index_read_map()
    Don't give warnings about not used plugins if we are using --warnings=0

  sql/sql_select.cc@1.547.1.1, 2007-08-13 16:11:13+03:00, monty@mysql.com +23 -21
    index_read() -> index_read_map()

  sql/sql_servers.cc@1.14, 2007-08-13 16:11:14+03:00, monty@mysql.com +12 -9
    index_read() -> index_read_map()

  sql/sql_show.cc@1.425.1.2, 2007-08-13 16:11:14+03:00, monty@mysql.com +12 -1
    Added TRANSACTIONAL to SHOW CREATE
    Fixed ROW_TYPE_PAGE

  sql/sql_string.cc@1.103.1.1, 2007-08-13 16:11:14+03:00, monty@mysql.com +4 -8
    Avoid compiler warnings when using C function pointers in C++

  sql/sql_table.cc@1.442.3.2, 2007-08-13 16:11:14+03:00, monty@mysql.com +2 -0
    Set create_info->transactional if we used TRANSACTIONAL=1

  sql/sql_udf.cc@1.80, 2007-08-13 16:11:14+03:00, monty@mysql.com +4 -3
    index_read() -> index_read_map()

  sql/sql_yacc.yy@1.590.1.2, 2007-08-13 16:11:14+03:00, monty@mysql.com +12 -1
    Added TRANSACTIONAL=0|1 to CREATE (for future)
    Added row type PAGE (was only partionally handled before)

  sql/strfunc.cc@1.17, 2007-08-13 16:11:14+03:00, monty@mysql.com +2 -4
    Avoid compiler warnings when using C function pointers in C++

  sql/table.cc@1.301.1.4, 2007-08-13 16:11:14+03:00, monty@mysql.com +21 -17
    More DBUG statements
    Declare all create_backup_ctx() functions identically
    Remember if table was created with TRANSACTIONAL flag or not (future safe)
    Renamed local variable to avoid hiding class variable

  sql/table.h@1.179.1.1, 2007-08-13 16:11:14+03:00, monty@mysql.com +1 -0
    Remember if table was created with TRANSACTIONAL=1

  sql/tztime.cc@1.58, 2007-08-13 16:11:14+03:00, monty@mysql.com +8 -8
    index_read() -> index_read_map()

  storage/archive/archive_reader.c@1.10, 2007-08-13 16:11:15+03:00, monty@mysql.com +1 -1
    Fixed compiler warning (on Forte)

  storage/archive/azio.c@1.20, 2007-08-13 16:11:15+03:00, monty@mysql.com +8 -5
    Fixed compiler warning (on Forte)

  storage/blackhole/ha_blackhole.cc@1.55, 2007-08-13 16:11:15+03:00, monty@mysql.com +5 -5
    index_read() -> index_read_map()

  storage/blackhole/ha_blackhole.h@1.19, 2007-08-13 16:11:15+03:00, monty@mysql.com +6 -5
    index_read() -> index_read_map()

  storage/csv/ha_tina.cc@1.84, 2007-08-13 16:11:15+03:00, monty@mysql.com +4 -0
    Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)

  storage/example/ha_example.cc@1.60, 2007-08-13 16:11:15+03:00, monty@mysql.com +4 -4
    index_read() -> index_read_map()

  storage/example/ha_example.h@1.25, 2007-08-13 16:11:15+03:00, monty@mysql.com +2 -2
    index_read() -> index_read_map()

  storage/heap/ha_heap.cc@1.117, 2007-08-13 16:11:15+03:00, monty@mysql.com +8 -6
    index_read() -> index_read_map()

  storage/heap/ha_heap.h@1.57, 2007-08-13 16:11:15+03:00, monty@mysql.com +6 -5
    index_read() -> index_read_map()

  storage/heap/hp_test1.c@1.22, 2007-08-13 16:11:15+03:00, monty@mysql.com +9 -9
    Fixed compiler warning (on Forte)

  storage/heap/hp_test2.c@1.32, 2007-08-13 16:11:15+03:00, monty@mysql.com +34 -33
    Fixed compiler warning (on Forte)

  storage/myisam/ft_boolean_search.c@1.113, 2007-08-13 16:11:15+03:00, monty@mysql.com +15 -14
    Fixed compiler warning (on Forte)

  storage/myisam/ft_nlq_search.c@1.49, 2007-08-13 16:11:15+03:00, monty@mysql.com +2 -2
    Fixed compiler warning (on Forte)

  storage/myisam/ft_parser.c@1.62, 2007-08-13 16:11:15+03:00, monty@mysql.com +15 -10
    Fixed compiler warning (on Forte)

  storage/myisam/ft_stopwords.c@1.28, 2007-08-13 16:11:15+03:00, monty@mysql.com +1 -1
    Fixed compiler warning (on Forte)

  storage/myisam/ha_myisam.cc@1.230, 2007-08-13 16:11:15+03:00, monty@mysql.com +8 -7
    index_read() -> index_read_map()

  storage/myisam/ha_myisam.h@1.88, 2007-08-13 16:11:15+03:00, monty@mysql.com +6 -5
    index_read() -> index_read_map()

  storage/myisam/mi_check.c@1.163, 2007-08-13 16:11:15+03:00, monty@mysql.com +8 -7
    Fixed compiler warning (on Forte)

  storage/myisam/mi_delete.c@1.47, 2007-08-13 16:11:16+03:00, monty@mysql.com +4 -4
    Fixed compiler warning (on Forte)

  storage/myisam/mi_dynrec.c@1.61, 2007-08-13 16:11:16+03:00, monty@mysql.com +18 -18
    Fixed compiler warning (on Forte)

  storage/myisam/mi_extra.c@1.57, 2007-08-13 16:11:16+03:00, monty@mysql.com +5 -3
    Fixed compiler warning (on Forte)

  storage/myisam/mi_key.c@1.60, 2007-08-13 16:11:16+03:00, monty@mysql.com +3 -2
    Fixed compiler warning (on Forte)

  storage/myisam/mi_keycache.c@1.15, 2007-08-13 16:11:16+03:00, monty@mysql.com +2 -1
    Fixed compiler warning (on Forte)

  storage/myisam/mi_locking.c@1.54, 2007-08-13 16:11:16+03:00, monty@mysql.com +2 -2
    Fixed compiler warning (on Forte)

  storage/myisam/mi_log.c@1.17, 2007-08-13 16:11:16+03:00, monty@mysql.com +8 -7
    Fixed compiler warning (on Forte)

  storage/myisam/mi_open.c@1.127, 2007-08-13 16:11:16+03:00, monty@mysql.com +16 -16
    Fixed compiler warning (on Forte)

  storage/myisam/mi_packrec.c@1.49, 2007-08-13 16:11:16+03:00, monty@mysql.com +5 -5
    Fixed compiler warning (on Forte)

  storage/myisam/mi_page.c@1.30, 2007-08-13 16:11:16+03:00, monty@mysql.com +2 -2
    Fixed compiler warning (on Forte)

  storage/myisam/mi_rkey.c@1.35.1.1, 2007-08-13 16:11:16+03:00, monty@mysql.com +1 -0
    Added comment

  storage/myisam/mi_search.c@1.68, 2007-08-13 16:11:16+03:00, monty@mysql.com +1 -1
    Fixed compiler warning (on Forte)

  storage/myisam/mi_statrec.c@1.19, 2007-08-13 16:11:16+03:00, monty@mysql.com +15 -15
    Fixed compiler warning (on Forte)

  storage/myisam/mi_test1.c@1.37, 2007-08-13 16:11:16+03:00, monty@mysql.com +38 -37
    Fixed compiler warning (on Forte)

  storage/myisam/mi_test2.c@1.38, 2007-08-13 16:11:17+03:00, monty@mysql.com +18 -18
    Fixed compiler warning (on Forte)

  storage/myisam/mi_test3.c@1.24, 2007-08-13 16:11:17+03:00, monty@mysql.com +6 -6
    Fixed compiler warning (on Forte)

  storage/myisam/mi_update.c@1.29, 2007-08-13 16:11:17+03:00, monty@mysql.com +3 -3
    Fixed compiler warning (on Forte)

  storage/myisam/mi_write.c@1.69, 2007-08-13 16:11:17+03:00, monty@mysql.com +3 -3
    Fixed compiler warning (on Forte)

  storage/myisam/myisamdef.h@1.102, 2007-08-13 16:11:17+03:00, monty@mysql.com +15 -15
    Fixed that file_read/file_write returns type size_t
    Changed some functions to use uchar * as argument/return value instead of char*
    This fixed some compiler warnings on Forte

  storage/myisam/myisamlog.c@1.38, 2007-08-13 16:11:17+03:00, monty@mysql.com +3 -2
    Fixed compiler warning (on Forte)

  storage/myisam/myisampack.c@1.66, 2007-08-13 16:11:17+03:00, monty@mysql.com +3 -3
    Fixed compiler warning (on Forte)

  storage/myisam/rt_test.c@1.18, 2007-08-13 16:11:17+03:00, monty@mysql.com +17 -17
    Fixed compiler warning (on Forte)

  storage/myisam/sort.c@1.71, 2007-08-13 16:11:17+03:00, monty@mysql.com +9 -9
    Fixed compiler warning (on Forte) by adding casts or changing variables to uchar*

  storage/myisam/sp_test.c@1.16, 2007-08-13 16:11:17+03:00, monty@mysql.com +18 -18
    Fixed compiler warning (on Forte) by adding casts or changing variables to uchar*

  storage/myisammrg/ha_myisammrg.cc@1.124, 2007-08-13 16:11:17+03:00, monty@mysql.com +8 -8
    index_read() -> index_read_map()

  storage/myisammrg/ha_myisammrg.h@1.56, 2007-08-13 16:11:17+03:00, monty@mysql.com +6 -5
    index_read() -> index_read_map()

  storage/myisammrg/myrg_create.c@1.16, 2007-08-13 16:11:17+03:00, monty@mysql.com +2 -2
    Fixed compiler warning (on Forte) by adding casts or changing variable types
    

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.70, 2007-08-13 16:11:18+03:00, monty@mysql.com +1 -1
    Tdummy -> align  (as in other part of cluster code)

  storage/ndb/src/kernel/vm/DynArr256.cpp@1.5, 2007-08-13 16:11:18+03:00, monty@mysql.com +0 -2
    Removed not used variable

  storage/ndb/src/ndbapi/Ndb.cpp@1.97, 2007-08-13 16:11:18+03:00, monty@mysql.com +0 -1
    Removed not used variable

  strings/strtod.c@1.31, 2007-08-13 16:11:18+03:00, monty@mysql.com +3 -0
    Include ieeefp.h to avoid compiler warning

  tests/bug25714.c@1.3, 2007-08-13 16:11:18+03:00, monty@mysql.com +2 -1
    Fixed compiler warning

  tests/mysql_client_test.c@1.248.1.1, 2007-08-13 16:11:18+03:00, monty@mysql.com +18 -20
    Remove not used variable
    Fixed indentation
    Removed never reached code
    Fixed compiler warning (on Forte) by adding casts or changing variable types

  vio/viosocket.c@1.52, 2007-08-13 16:11:18+03:00, monty@mysql.com +1 -1
    Fixed compiler warning (on Forte) by adding casts or changing variable types

ChangeSet@1.2557.1.8, 2007-08-09 22:05:56+05:00, gluh@mysql.com +3 -0
  Bug#30322 Server crashes on selecting from i_s.columns when cluster is running -regression
  disable partition processing if we open frm file only

  mysql-test/suite/ndb/r/ndb_dd_basic.result@1.21, 2007-08-09 22:05:54+05:00, gluh@mysql.com +3 -0
    test result

  mysql-test/suite/ndb/t/ndb_dd_basic.test@1.17, 2007-08-09 22:05:54+05:00, gluh@mysql.com +6 -0
    test case

  sql/table.cc@1.307.1.1, 2007-08-09 22:05:54+05:00, gluh@mysql.com +1 -1
    disable partition processing if we open frm file only

ChangeSet@1.2557.1.7, 2007-08-09 20:41:26+05:00, gluh@mysql.com +3 -0
  Bug#30310 wrong result on SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE ..
  1. added check to fill_schema_schemata() func.
     if we have db lookup value we should check that db exists
  2. added check to get_all_tables() func
     if we have lookup db name or tables name values we shoud check that
     these values are not empty strings
  3. fixed typo

  mysql-test/r/information_schema.result@1.160, 2007-08-09 20:41:24+05:00, gluh@mysql.com +22 -0
    test result

  mysql-test/t/information_schema.test@1.103, 2007-08-09 20:41:24+05:00, gluh@mysql.com +16 -0
    test case

  sql/sql_show.cc@1.431, 2007-08-09 20:41:24+05:00, gluh@mysql.com +43 -11
    Bug#30310 wrong result on SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE ..
    1. added check to fill_schema_schemata() func.
       if we have db lookup value we should check that db exists
    2. added check to get_all_tables() func
       if we have lookup db name or tables name values we shoud check that
       these values are not empty strings
    3. fixed typo

ChangeSet@1.2557.3.1, 2007-08-09 19:57:14+05:00, gluh@mysql.com +2 -0
  fill_schema_table_from_frm() function uses get_table_share() function
  which is faster than open_table_def() func.
  This patch fixes the porblem with information_schema test timeout.

  sql/sql_show.cc@1.430, 2007-08-09 19:57:12+05:00, gluh@mysql.com +55 -34
    fill_schema_table_from_frm() function uses get_table_share() function
    which is faster than open_table_def() func.
    This patch fixes the porblem with information_schema test timeout.

  sql/unireg.h@1.55, 2007-08-09 19:57:12+05:00, gluh@mysql.com +34 -5
    added description of flags

ChangeSet@1.2557.1.5, 2007-08-09 14:56:57+02:00, joerg@trift2. +1 -0
  mysys/my_gethwaddr.c
      Fix a typing error in a conditional compiling directive
      (reported by Vasil Dimov: Thanks !),
      and improve their nesting ("MAIN" independent of platform).

  mysys/my_gethwaddr.c@1.7, 2007-08-09 14:56:52+02:00, joerg@trift2. +5 -2
    Fix a typing error, reported by Vasil Dimov (thanks !):
    The condition is meant to apply to FreeBSD or Linux.
    
    Improve the nesting of conditional compiling directives,
    handle "MAIN" and the platform issues independent of each other.

ChangeSet@1.2557.1.4, 2007-08-08 16:50:43+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -0
  BUG#30274 (Debug server crashes because mutex isn't initialized):
  
  Completion patch, since it is possible that Log_event::write_header()
  is called with no current thread.
  
  When starting the server, there is no thread available, but
  MYSQL_BIN_LOG::open() is called to initialize the binary log. The
  function writes a format description log event to the binary log,
  which means that Log_event::write_header() can be called with no
  current thread object available.

  sql/log_event.cc@1.296.1.2, 2007-08-08 16:50:38+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +12 -2
    Since Log_event::write_header() can be called from inside
    init_server_components(), it is possible that thd is NULL. In this
    case, we set the time of the event to the current time instead
    of the start time of the query.

ChangeSet@1.2560, 2007-08-08 16:28:00+03:00, mats@a88-113-38-195.elisa-laajakaista.fi +1 -0
  BUG#30274 (Debug server crashes because mutex isn't initialized):
  
  Completion patch, since it is possible that Log_event::write_header()
  is called with no current thread.
  
  When starting the server, there is no thread available, but
  MYSQL_BIN_LOG::open() is called to initialize the binary log. The
  function writes a format description log event to the binary log,
  which means that Log_event::write_header() can be called with no
  current thread object available.

  sql/log_event.cc@1.298, 2007-08-08 16:26:11+03:00, mats@a88-113-38-195.elisa-laajakaista.fi +12 -2
    Since Log_event::write_header() can be called from inside
    init_server_components(), it is possible that thd is NULL. In this
    case, we set the time of the event to the current time instead
    of the start time of the query.

ChangeSet@1.2558.1.4, 2007-08-08 15:49:19+04:00, kostja@bodhi.(none) +2 -0
  A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due to loaded system

  mysql-test/r/log_state.result@1.7, 2007-08-08 15:49:17+04:00, kostja@bodhi.(none) +2 -2
    Update results (Bug#28830)

  mysql-test/t/log_state.test@1.9, 2007-08-08 15:49:17+04:00, kostja@bodhi.(none) +2 -2
    A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due 
    to loaded system - make the test more deterministic.

ChangeSet@1.2558.1.3, 2007-08-08 14:02:07+04:00, kostja@bodhi.(none) +1 -0
  Apply patch for Bug#27806 table comments not passed in to storage engine 
  during "CREATE ... LIKE ..."
  Only affects engine writers.
  No change in server behaviour.

  sql/table.cc@1.308, 2007-08-08 14:02:03+04:00, kostja@bodhi.(none) +1 -0
    Apply patch for Bug#27806 table comments not passed in to storage engine 
    during "CREATE ... LIKE ..."

ChangeSet@1.2557.1.3, 2007-08-07 23:20:21+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -0
  Removed wrong call to my_time(), before my_init() has been called.

  sql/log_event.cc@1.296.1.1, 2007-08-07 23:20:15+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -1
    Removed wrong call to my_time(), before my_init() has been called.

ChangeSet@1.2559, 2007-08-07 22:54:42+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -0
  Removed a wrong call to my_time() before my_init() has been called.
  
  Fix for Bug#30274 "Debug server crashes because mutex isn't initialized"

  sql/log_event.cc@1.297, 2007-08-07 22:54:38+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -1
    Removed a wrong call to my_time() before my_init() has been called.
    
    Fix for Bug#30274 "Debug server crashes because mutex isn't initialized"

ChangeSet@1.2557.2.1, 2007-08-06 18:46:00-07:00, omer@linux.site +19 -0
  Updated funcs_1 test and result files (not including cluster) for 5.1.21

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.7, 2007-08-06 18:45:53-07:00, omer@linux.site +497 -380
    Updated result file

  mysql-test/suite/funcs_1/r/innodb_func_view.result@1.7, 2007-08-06 18:45:53-07:00, omer@linux.site +4967 -4542
    Updated result file

  mysql-test/suite/funcs_1/r/innodb_storedproc_07.result@1.4, 2007-08-06 18:45:53-07:00, omer@linux.site +4 -4
    Updated result file

  mysql-test/suite/funcs_1/r/innodb_storedproc_08.result@1.4, 2007-08-06 18:45:53-07:00, omer@linux.site +108 -0
    Updated result file

  mysql-test/suite/funcs_1/r/innodb_trig_03e.result@1.2, 2007-08-06 18:45:53-07:00, omer@linux.site +13 -13
    Updated result file

  mysql-test/suite/funcs_1/r/innodb_views.result@1.7, 2007-08-06 18:45:53-07:00, omer@linux.site +26 -26
    Updated result file

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.7, 2007-08-06 18:45:53-07:00, omer@linux.site +413 -296
    Updated result file

  mysql-test/suite/funcs_1/r/memory_func_view.result@1.7, 2007-08-06 18:45:54-07:00, omer@linux.site +4967 -4542
    Updated result file

  mysql-test/suite/funcs_1/r/memory_storedproc_07.result@1.4, 2007-08-06 18:45:54-07:00, omer@linux.site +4 -4
    Updated result file

  mysql-test/suite/funcs_1/r/memory_storedproc_08.result@1.4, 2007-08-06 18:45:54-07:00, omer@linux.site +108 -0
    Updated result file

  mysql-test/suite/funcs_1/r/memory_trig_03e.result@1.2, 2007-08-06 18:45:54-07:00, omer@linux.site +13 -13
    Updated result file

  mysql-test/suite/funcs_1/r/memory_views.result@1.7, 2007-08-06 18:45:54-07:00, omer@linux.site +26 -26
    Updated result file

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.7, 2007-08-06 18:45:54-07:00, omer@linux.site +413 -296
    Updated result file

  mysql-test/suite/funcs_1/r/myisam_func_view.result@1.7, 2007-08-06 18:45:55-07:00, omer@linux.site +4967 -4542
    Updated result file

  mysql-test/suite/funcs_1/r/myisam_storedproc_07.result@1.4, 2007-08-06 18:45:55-07:00, omer@linux.site +4 -4
    Updated result file

  mysql-test/suite/funcs_1/r/myisam_storedproc_08.result@1.4, 2007-08-06 18:45:55-07:00, omer@linux.site +108 -0
    Updated result file

  mysql-test/suite/funcs_1/r/myisam_trig_03e.result@1.2, 2007-08-06 18:45:55-07:00, omer@linux.site +13 -13
    Updated result file

  mysql-test/suite/funcs_1/r/myisam_views.result@1.7, 2007-08-06 18:45:55-07:00, omer@linux.site +6884 -6851
    Updated result file

  mysql-test/suite/funcs_1/views/views_master.inc@1.6, 2007-08-06 18:45:55-07:00, omer@linux.site +8 -4
    updated test file

ChangeSet@1.2557.1.1, 2007-08-06 23:16:01+02:00, kent@mysql.com +22 -0
  CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:
    Additional changes for bug#29903
    - Changed to do embedded build part as normal build, when
      WITH_EMBEDDED_SERVER is set.
    - Allow both normal and debug build with embedded.
    - Build static embedded library by pointing out all source and compile
      it all, i.e. not building libraries from libraries, not portable.
    - Let embedded use generated files from the "sql" directory, added
      dependencies to make sure built before embedded.
    - Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
      linked in when debug target is used.
    - Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
      others can't depend on it, not defined at configure time. Instead
      set the output file name.
    - Created work around for bug in CMake 2.4.6 and output names, to
      set the "mysqld<suffix>.pdb" name to the same base name.
    - Set the correct manifest "name" (patch by iggy)

  CMakeLists.txt@1.32, 2007-08-06 23:14:46+02:00, kent@mysql.com +9 -25
    Changes for embedded and Windows

  libmysql/CMakeLists.txt@1.13, 2007-08-06 23:14:46+02:00, kent@mysql.com +13 -12
    Changes for embedded and Windows

  libmysqld/CMakeLists.txt@1.17, 2007-08-06 23:14:47+02:00, kent@mysql.com +133 -94
    Changes for embedded and Windows

  libmysqld/examples/CMakeLists.txt@1.7, 2007-08-06 23:14:47+02:00, kent@mysql.com +6 -6
    Changes for embedded and Windows

  mysys/CMakeLists.txt@1.12, 2007-08-06 23:14:47+02:00, kent@mysql.com +5 -6
    Changes for embedded and Windows

  regex/CMakeLists.txt@1.6, 2007-08-06 23:14:47+02:00, kent@mysql.com +6 -1
    Changes for embedded and Windows

  server-tools/instance-manager/CMakeLists.txt@1.8, 2007-08-06 23:14:47+02:00, kent@mysql.com +1 -1
    Changes for embedded and Windows

  sql/CMakeLists.txt@1.17, 2007-08-06 23:14:47+02:00, kent@mysql.com +63 -46
    Changes for embedded and Windows

  storage/archive/CMakeLists.txt@1.8, 2007-08-06 23:14:47+02:00, kent@mysql.com +6 -2
    Changes for embedded and Windows

  storage/blackhole/CMakeLists.txt@1.7, 2007-08-06 23:14:47+02:00, kent@mysql.com +6 -1
    Changes for embedded and Windows

  storage/csv/CMakeLists.txt@1.8, 2007-08-06 23:14:47+02:00, kent@mysql.com +6 -1
    Changes for embedded and Windows

  storage/example/CMakeLists.txt@1.6, 2007-08-06 23:14:47+02:00, kent@mysql.com +6 -1
    Changes for embedded and Windows

  storage/federated/CMakeLists.txt@1.5, 2007-08-06 23:14:47+02:00, kent@mysql.com +6 -4
    Changes for embedded and Windows

  storage/heap/CMakeLists.txt@1.6, 2007-08-06 23:14:47+02:00, kent@mysql.com +6 -4
    Changes for embedded and Windows

  storage/innobase/CMakeLists.txt@1.10, 2007-08-06 23:14:47+02:00, kent@mysql.com +9 -7
    Changes for embedded and Windows

  storage/myisam/CMakeLists.txt@1.8, 2007-08-06 23:14:47+02:00, kent@mysql.com +23 -20
    Changes for embedded and Windows

  storage/myisammrg/CMakeLists.txt@1.6, 2007-08-06 23:14:47+02:00, kent@mysql.com +6 -4
    Changes for embedded and Windows

  strings/CMakeLists.txt@1.6, 2007-08-06 23:14:47+02:00, kent@mysql.com +6 -1
    Changes for embedded and Windows

  vio/CMakeLists.txt@1.5, 2007-08-06 23:14:47+02:00, kent@mysql.com +7 -1
    Changes for embedded and Windows

  win/README@1.14, 2007-08-06 23:14:47+02:00, kent@mysql.com +2 -16
    Changes for embedded and Windows

  win/configure.js@1.10, 2007-08-06 23:14:47+02:00, kent@mysql.com +1 -1
    Changes for embedded and Windows

  win/mysql_manifest.cmake@1.4, 2007-08-06 23:14:47+02:00, kent@mysql.com +1 -1
    Changes for embedded and Windows

ChangeSet@1.2536.45.8, 2007-08-06 23:43:53+04:00, kostja@bodhi.(none) +1 -0
  Fix one more warning.

  client/mysqldump.c@1.289.2.5, 2007-08-06 23:43:51+04:00, kostja@bodhi.(none) +0 -1
    Fix one more warning.

ChangeSet@1.2558, 2007-08-06 21:11:09+02:00, jbruehe@mysql.com +1 -0
  Raise version number after cloning 5.1.21-beta

  configure.in@1.481, 2007-08-06 21:10:54+02:00, jbruehe@mysql.com +1 -1
    Raise version number after cloning 5.1.21-beta

ChangeSet@1.2536.45.7, 2007-08-06 22:52:50+04:00, kostja@bodhi.(none) +1 -0
  Fix "db_cl_altered might be used uninitialized" warning.

  client/mysqldump.c@1.289.2.4, 2007-08-06 22:52:48+04:00, kostja@bodhi.(none) +3 -3
    Fix "db_cl_altered might be used uninitialized" warning.

ChangeSet@1.2536.45.6, 2007-08-06 22:49:47+04:00, kostja@bodhi.(none) +1 -0
  Fix warnings.

  client/mysqldump.c@1.289.2.3, 2007-08-06 22:49:44+04:00, kostja@bodhi.(none) +5 -4
    Fix warnings.

ChangeSet@1.2536.45.5, 2007-08-06 22:42:13+04:00, kostja@bodhi.(none) +1 -0
  Fix failing ddl_i18n* tests in the team tree.

  client/mysqldump.c@1.289.2.2, 2007-08-06 22:42:07+04:00, kostja@bodhi.(none) +7 -7
    Fix failing ddl_i18n* tests in the team tree.

ChangeSet@1.1810.3228.1, 2007-08-06 14:22:24+04:00, kostja@bodhi.(none) +2 -0
  A fix and a test case for Bug#29306 "Truncated data in MS Access with decimal (3,1) columns in a 
  VIEW".
  
  mysql_list_fields() C API function would incorrectly set MYSQL_FIELD::decimals
  member for some view columns.
  
  The problem was in an incomplete implementation of 
  Item_ident_for_show::make_field(), which is responsible for view
  columns metadata.

  sql/item.cc@1.113.96.1, 2007-08-06 14:22:21+04:00, kostja@bodhi.(none) +1 -1
    A fix for Bug#29306 -- properly initialize decimals in 
    Item_ident_for_show::make_field

  tests/mysql_client_test.c@1.167.1.68, 2007-08-06 14:22:22+04:00, kostja@bodhi.(none) +52 -2
    Add a test case forBug#29306. Fix warnings.

ChangeSet@1.1810.3206.25, 2007-08-06 08:31:09+02:00, kent@mysql.com +1 -0
  make_win_bin_dist:
    Corrected install path

  scripts/make_win_bin_dist@1.1.13.7, 2007-08-06 08:30:53+02:00, kent@mysql.com +2 -2
    Corrected install path

ChangeSet@1.1810.3206.24, 2007-08-06 08:28:16+02:00, kent@mysql.com +1 -0
  make_win_bin_dist:
    Copy embedded .pdb and static debug lib

  scripts/make_win_bin_dist@1.1.13.6, 2007-08-06 08:27:59+02:00, kent@mysql.com +7 -1
    Copy embedded .pdb and static debug lib

ChangeSet@1.1810.3206.23, 2007-08-06 01:29:53+02:00, kent@mysql.com +1 -0
  mysql-test-run.pl:
    Search "relwithdebinfo" directory in CMake Visual Studio build
    Search for "mysqld-debug" even in source tree

  mysql-test/mysql-test-run.pl@1.30.49.90, 2007-08-06 01:28:50+02:00, kent@mysql.com +2 -0
    Search "relwithdebinfo" directory in CMake Visual Studio build
    Search for "mysqld-debug" even in source tree

ChangeSet@1.2536.45.4, 2007-08-05 13:55:37+04:00, dlenev@mockturtle.local +2 -0
  Added test for bug #21281 "Pending write lock is incorrectly removed
  when its statement being KILLed". The bug itself was fixed by separate
  patch in 5.0 tree.

  mysql-test/r/lock_multi.result@1.28, 2007-08-05 13:55:29+04:00, dlenev@mockturtle.local +10 -0
    Added test for bug #21281 "Pending write lock is incorrectly removed
    when its statement being KILLed".

  mysql-test/t/lock_multi.test@1.30, 2007-08-05 13:55:29+04:00, dlenev@mockturtle.local +35 -0
    Added test for bug #21281 "Pending write lock is incorrectly removed
    when its statement being KILLed".

ChangeSet@1.1810.3217.4, 2007-08-05 13:17:07+04:00, dlenev@mockturtle.local +1 -0
  Fix for bug #21281 "Pending write lock is incorrectly removed when its
  statement being KILLed".
  
  When statement which was trying to obtain write lock on then table and
  which was blocked by existing read lock was killed, concurrent statements
  that were trying to obtain read locks on the same table and that were
  blocked by the presence of this pending write lock were not woken up and
  had to wait until this first read lock goes away.
  
  This problem was caused by the fact that we forgot to wake up threads
  which pending requests could have been satisfied after removing lock
  request for the killed thread.
  
  The patch solves the problem by waking up those threads in such situation.
  
  Test for this bug will be added to 5.1 only as it has much better
  facilities for its implementation. Particularly, by using I_S.PROCESSLIST
  and wait_condition.inc script we can wait until thread will be blocked on
  certain table lock without relying on unconditional sleep (which usage
  increases time needed for test runs and might cause spurious test
  failures on slower platforms).

  mysys/thr_lock.c@1.49.1.6, 2007-08-05 13:16:59+04:00, dlenev@mockturtle.local +32 -8
    After removing lock request from the list of waiting lock requests
    (e.g. when we discover that current thread was killed) we should
    wake up other threads waiting for the same lock which pending
    requests now can be satisfied. To implement this behavior we
    move code responsible for waking up threads which pending requests
    can be satisfied from thr_unlock() to new wake_up_waiters() procedure
    and use it in wait_for_lock() and hr_abort_locks_for_thread().

ChangeSet@1.2536.1.66, 2007-08-04 02:51:58-04:00, iggy@amd64.(none) +2 -0
  Post Merge Fixup.

  CMakeLists.txt@1.31, 2007-08-04 02:51:55-04:00, iggy@amd64.(none) +18 -19
    Post Merge Fixup.

  libmysql/CMakeLists.txt@1.12, 2007-08-04 02:51:55-04:00, iggy@amd64.(none) +14 -14
    Post Merge Fixup.

ChangeSet@1.2536.50.3, 2007-08-03 21:08:48-04:00, iggy@amd64.(none) +2 -0
  Bug#29903 The CMake build method does not produce the embedded library.
  - GCov fix.

  mysql-test/r/mysql.result@1.38, 2007-08-03 21:08:46-04:00, iggy@amd64.(none) +1 -0
    Bug#29903 The CMake build method does not produce the embedded library.
    -Result

  mysql-test/t/mysql.test@1.46, 2007-08-03 21:08:46-04:00, iggy@amd64.(none) +7 -0
    Bug#29903 The CMake build method does not produce the embedded library.
    - Test for warning message.

ChangeSet@1.2536.50.2, 2007-08-03 18:56:24-04:00, iggy@amd64.(none) +1 -0
  Bug#29903 The CMake build method does not produce the embedded library.
  - Additional changes to correct link failure in Do-linkall script.

  libmysqld/libmysqld.def@1.22, 2007-08-03 18:56:21-04:00, iggy@amd64.(none) +5 -3
    Bug#29903 The CMake build method does not produce the embedded library.
    - Missing exports.

ChangeSet@1.1810.3206.20, 2007-08-04 00:26:46+02:00, kent@mysql.com +1 -0
  CMakeLists.txt:
    Removed space between '-D' and symbol

  CMakeLists.txt@1.1.27.3, 2007-08-04 00:26:21+02:00, kent@mysql.com +14 -14
    Removed space between '-D' and symbol

ChangeSet@1.2536.1.62, 2007-08-03 22:02:19+02:00, df@pippilotta.erinye.com +1 -0
  after-merge fix

  sql/table.cc@1.307, 2007-08-03 22:02:17+02:00, df@pippilotta.erinye.com +2 -1
    do not attempt to set no_replicate if OPEN_FRM_FILE_ONLY was set

ChangeSet@1.1810.3206.19, 2007-08-03 21:51:37+02:00, kent@mysql.com +14 -0
  CMakeLists.txt, README, configure.js
    Several adjustments to make client libraries pass the link test
    on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)

  win/README@1.1.5.1, 2007-08-03 15:23:23+02:00, kent@mysql.com +1 -2
    - Removed references to PARTITION engine, 5.1 only

  win/configure.js@1.1.7.1, 2007-08-03 15:23:35+02:00, kent@mysql.com +0 -1
    - Removed references to PARTITION engine, 5.1 only

  CMakeLists.txt@1.1.27.2, 2007-08-03 21:42:27+02:00, kent@mysql.com +2 -0

  CMakeLists.txt@1.1.27.1, 2007-08-03 15:20:30+02:00, kent@mysql.com +35 -59
    - Removed defines with no effect
    - Removed plugin handling, that is 5.1 only
    - Added EXAMPLE engine handling
    - Formatting changes, to make future reviewing of options easier

  dbug/CMakeLists.txt@1.1.3.1, 2007-08-03 21:45:26+02:00, kent@mysql.com +8 -3
    Changed to optionally be included to give a file list only

  extra/CMakeLists.txt@1.1.5.1, 2007-08-03 21:40:04+02:00, kent@mysql.com +4 -4
    Use the special 'debug' list element to mark that "dbug" library
    is only to be linked against if build type "Debug".

  extra/yassl/CMakeLists.txt@1.1.3.1, 2007-08-03 21:45:26+02:00, kent@mysql.com +9 -3
    Changed to optionally be included to give a file list only

  extra/yassl/taocrypt/CMakeLists.txt@1.1.3.1, 2007-08-03 21:45:26+02:00, kent@mysql.com +6 -2
    Changed to optionally be included to give a file list only

  libmysql/CMakeLists.txt@1.1.5.1, 2007-08-03 21:48:32+02:00, kent@mysql.com +42 -14
    For compatibility with Visual Studio 2005, list all files that are to
    be part of the library build, i.e. libraries can't be built from other
    libraries. Set SOURCE_SUBLIBS and include the file listings from
    "zlib", "dbug", "taocrypt" and "yassl"

  mysys/CMakeLists.txt@1.1.6.2, 2007-08-03 21:43:43+02:00, kent@mysql.com +1 -1
    Restored include path to "mysys" itself

  mysys/CMakeLists.txt@1.1.6.1, 2007-08-03 15:22:40+02:00, kent@mysql.com +1 -2
    - Removed C++ flag changes, "mysys" lib is C only
    - No need to set current directory into include flags

  scripts/CMakeLists.txt@1.3.1.2, 2007-08-03 21:40:43+02:00, kent@mysql.com +1 -1
    Use the special 'debug' list element to mark that "dbug" library
    is only to be linked against if build type "Debug".

  server-tools/instance-manager/CMakeLists.txt@1.1.3.1, 2007-08-03 21:40:48+02:00, kent@mysql.com +1 -1
    Use the special 'debug' list element to mark that "dbug" library
    is only to be linked against if build type "Debug".

  sql/CMakeLists.txt@1.1.10.2, 2007-08-03 21:40:52+02:00, kent@mysql.com +1 -1
    Use the special 'debug' list element to mark that "dbug" library
    is only to be linked against if build type "Debug".

  myisam/CMakeLists.txt@1.1.3.1, 2007-08-03 21:40:42+02:00, kent@mysql.com +4 -4
    Use the special 'debug' list element to mark that "dbug" library
    is only to be linked against if build type "Debug".

  zlib/CMakeLists.txt@1.1.3.1, 2007-08-03 21:45:26+02:00, kent@mysql.com +6 -3
    Changed to optionally be included to give a file list only

ChangeSet@1.2536.50.1, 2007-08-03 14:43:12-04:00, iggy@amd64.(none) +11 -0
  Bug#29903 The CMake build method does not produce the embedded library.
  - Changes to correct and test Windows embedded build.

  client/CMakeLists.txt@1.21.2.1, 2007-08-03 14:43:09-04:00, iggy@amd64.(none) +36 -33
    Bug#29903 The CMake build method does not produce the embedded library.
    - Build the mysqlclient library and echo for the embedded solution.

  CMakeLists.txt@1.35.2.1, 2007-08-03 14:43:09-04:00, iggy@amd64.(none) +18 -19
    Bug#29903 The CMake build method does not produce the embedded library.
    - Hardcode CSV for all configurations.
    - Add client directory for gen_lex_hash dependency.

  BitKeeper/etc/ignore@1.295.1.2, 2007-08-03 14:43:09-04:00, iggy@amd64.(none) +3 -0
    Bug#29903 The CMake build method does not produce the embedded library.
    - Ignore auto-generated Windows embedded resources.

  client/client_priv.h@1.72.1.1, 2007-08-03 14:43:09-04:00, iggy@amd64.(none) +1 -1
    Bug#29903 The CMake build method does not produce the embedded library.
    - Defined new option.

  client/mysql.cc@1.266.1.1, 2007-08-03 14:43:09-04:00, iggy@amd64.(none) +36 -12
    Bug#29903 The CMake build method does not produce the embedded library.
    - Add server-arg command line parameter

  libmysqld/CMakeLists.txt@1.14.1.1, 2007-08-03 14:43:09-04:00, iggy@amd64.(none) +57 -6
    Bug#29903 The CMake build method does not produce the embedded library.
    - Added auto generated resources; sql_yacc.cc, sql_yacc.h, message.rc
    message.h and lex_hash.h.
    - Link csv library to libmsyqld.

  libmysqld/Makefile.am@1.114.1.1, 2007-08-03 14:43:09-04:00, iggy@amd64.(none) +1 -1
    Bug#29903 The CMake build method does not produce the embedded library.
    - Include CMakeLists.txt in dist.

  libmysqld/examples/CMakeLists.txt@1.6, 2007-08-03 14:43:09-04:00, iggy@amd64.(none) +3 -3
    Bug#29903 The CMake build method does not produce the embedded library.
    - Follow existing naming convention.

  libmysqld/examples/Makefile.am@1.38.1.1, 2007-08-03 14:43:09-04:00, iggy@amd64.(none) +1 -0
    Bug#29903 The CMake build method does not produce the embedded library.
    - Include CMakeLists.txt in dist.

  mysql-test/mysql-test-run.pl@1.317.1.1, 2007-08-03 14:43:09-04:00, iggy@amd64.(none) +31 -0
    Bug#29903 The CMake build method does not produce the embedded library.
    - Move embedded option block earlier in the script.
    - Added the path to the libmysqld.dll to Windows path.

  win/README@1.13, 2007-08-03 14:43:09-04:00, iggy@amd64.(none) +15 -0
    Bug#29903 The CMake build method does not produce the embedded library.
    - Add instructions for building/testing the embedded library.

ChangeSet@1.2536.1.61, 2007-08-03 18:57:18+02:00, df@pippilotta.erinye.com +1 -0
  merge fix

  libmysql/CMakeLists.txt@1.10, 2007-08-03 18:57:14+02:00, df@pippilotta.erinye.com +2 -1
    merge fix

ChangeSet@1.1810.3226.1, 2007-08-03 18:31:54+02:00, dfischer@bk-internal.mysql.com +1 -0
  .del-readme.txt-grumble-grumble:
    Rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt-grumble-grumble

  BitKeeper/deleted/.del-readme.txt-grumble-grumble@1.2.1.1, 2007-08-03 18:29:05+02:00, dfischer@bk-internal.mysql.com +0 -0
    Rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt-grumble-grumble

ChangeSet@1.2550.1.1, 2007-08-03 17:12:00+02:00, mkindahl@dl145h.mysql.com +3 -0
  Fixes to eliminate valgrind warnings.

  sql/rpl_record.cc@1.7, 2007-08-03 17:11:37+02:00, mkindahl@dl145h.mysql.com +6 -5
    Factoring out expression and putting it in an auto variable.

  sql/rpl_utility.cc@1.13, 2007-08-03 17:11:37+02:00, mkindahl@dl145h.mysql.com +1 -1
    Removing a check that causes compile warnings.

  sql/rpl_utility.h@1.10, 2007-08-03 17:11:37+02:00, mkindahl@dl145h.mysql.com +8 -4
    Ensuring that there is enough memory for the metadata, to avoid reads
    from uninitialized memory. Initializing the memory to keep valgrind
    quiet.

ChangeSet@1.2536.1.58, 2007-08-03 14:43:11+02:00, df@pippilotta.erinye.com +1 -0
  add mysqlslap back to windows builds for 5.1

  client/CMakeLists.txt@1.17, 2007-08-03 14:43:08+02:00, df@pippilotta.erinye.com +4 -0
    add mysqlslap back in for 5.1

ChangeSet@1.1810.3225.2, 2007-08-03 15:57:14+05:00, bar@mysql.com +1 -0
  After merge fix

  mysql-test/r/ctype_ucs.result@1.39.1.16, 2007-08-03 15:57:13+05:00, bar@mysql.com +1 -0
    After merge fix

ChangeSet@1.1810.2977.21, 2007-08-03 15:25:23+05:00, bar@mysql.com +20 -0
  Bug#28875 Conversion between ASCII and LATIN1 charsets does not function
  (Regression, caused by a patch for the bug 22646).
  Problem: when result type of date_format() was changed from
  binary string to character string, mixing date_format()
  with a ascii column in CONCAT() stopped to work.
  Fix:
  - adding "repertoire" flag into DTCollation class,
  to mark items which can return only pure ASCII strings.
  - allow character set conversion from pure ASCII to other character sets.

  include/m_ctype.h@1.114.1.15, 2007-08-03 15:25:21+05:00, bar@mysql.com +11 -0
    Defining new flags.
    Adding new function prototypes.

  mysql-test/r/ctype_ucs.result@1.39.2.1, 2007-08-03 15:25:21+05:00, bar@mysql.com +26 -0
    Adding tests.

  mysql-test/r/ctype_utf8.result@1.85.10.1, 2007-08-03 15:25:21+05:00, bar@mysql.com +36 -0
    Adding tests.

  mysql-test/r/func_time.result@1.47.20.1, 2007-08-03 15:25:21+05:00, bar@mysql.com +16 -0
    Adding tests.

  mysql-test/t/ctype_ucs.test@1.36.3.1, 2007-08-03 15:25:21+05:00, bar@mysql.com +30 -0
    Adding tests.

  mysql-test/t/ctype_utf8.test@1.84.9.1, 2007-08-03 15:25:21+05:00, bar@mysql.com +40 -0
    Adding tests.

  mysql-test/t/func_time.test@1.41.18.1, 2007-08-03 15:25:21+05:00, bar@mysql.com +26 -0
    Adding test.

  mysys/charset.c@1.150.1.2, 2007-08-03 15:25:21+05:00, bar@mysql.com +3 -0
    Adding pure ASCII detection when loading a dynamic character set.

  sql/item.cc@1.113.94.1, 2007-08-03 15:25:21+05:00, bar@mysql.com +32 -14
    - Moving detection of a Unicode superset into function.
    - Adding detection of a ASCII subset.
    - Adding creation of to-ASCII character set convertor when
      safe_charset_converter() failed and when the argument.
      repertoire is know to be pure ASCII.

  sql/item.h@1.183.38.1, 2007-08-03 15:25:21+05:00, bar@mysql.com +36 -7
    - Adding "repertoire" member into DTCollation class.
    - Adding "repertoire" argument to constructors.
    - Adding new methods:
      set_repertoire_from_charset()
      set_repertoire_from_value()

  sql/item_func.cc@1.270.72.1, 2007-08-03 15:25:21+05:00, bar@mysql.com +1 -1
    Adding "repertoire" argument.

  sql/item_strfunc.cc@1.261.28.1, 2007-08-03 15:25:21+05:00, bar@mysql.com +2 -1
    Adding "repertoire" argument.

  sql/item_timefunc.cc@1.100.33.1, 2007-08-03 15:25:21+05:00, bar@mysql.com +5 -1
    Initializing the result repertoire taking into account the "is_ascii"
    flag of the current locale.

  sql/sql_lex.cc@1.142.43.1, 2007-08-03 15:25:21+05:00, bar@mysql.com +5 -1
    Detect 7bit strings, return in Lex->text_string_is_7bit.

  sql/sql_lex.h@1.175.42.1, 2007-08-03 15:25:21+05:00, bar@mysql.com +4 -0
    Adding new member into LEX structure.
    Adding new member into Lex_input_stream

  sql/sql_string.cc@1.91.1.7, 2007-08-03 15:25:21+05:00, bar@mysql.com +2 -0
    Allow simple copy from pure ASCII to a ASCII-based character set.

  sql/sql_yacc.yy@1.371.121.1, 2007-08-03 15:25:21+05:00, bar@mysql.com +63 -25
    Depening on Lex->text_string_is_7bit and character set features,
    create Item_string with MY_REPERTOIRE_ASCII when it is possible.

  strings/conf_to_src.c@1.19.2.1, 2007-08-03 15:25:21+05:00, bar@mysql.com +29 -4
    - Adding printing of the "MY_CS_PUREASCII" flag
    - Adding printing of copyright

  strings/ctype-extra.c@1.23.3.1, 2007-08-03 15:25:22+05:00, bar@mysql.com +4 -3
    Recreating ctype-extra.c: ascii_general_ci and ascii_bin
    are now marked with MY_CS_PUREASCII flag.

  strings/ctype.c@1.63.1.3, 2007-08-03 15:25:22+05:00, bar@mysql.com +86 -0
    Adding new functions.

ChangeSet@1.2536.1.57, 2007-08-03 14:17:51+05:00, gluh@mysql.com +1 -0
  powermacg5 problem fix
  we need a copy of I_S name because the name can be changed in case of lowercase_table_name!=0

  sql/sql_show.cc@1.428, 2007-08-03 14:17:49+05:00, gluh@mysql.com +7 -3
    powermacg5 problem fix
    we need a copy of I_S name because the name can be changed in case of lowercase_table_name!=0

ChangeSet@1.2536.49.1, 2007-08-03 11:06:53+02:00, joerg@trift2. +5 -0
  Re-apply fixes originally made by Kent, 
  they got lost because of a merge conflict with the CMakeLists.txt 
  dependency fix (numer 29982 in our bugs DB).
  
  These changes are for bug#30118.

  client/CMakeLists.txt@1.16, 2007-08-03 11:06:49+02:00, joerg@trift2. +26 -101
    Manual merge from 5.0 (bug#30118)

  libmysql/CMakeLists.txt@1.9, 2007-08-03 11:06:49+02:00, joerg@trift2. +43 -13
    Manual merge from 5.0 (bug#30118)

  mysys/CMakeLists.txt@1.10, 2007-08-03 11:06:49+02:00, joerg@trift2. +13 -8
    Manual merge from 5.0 (bug#30118)

  sql/CMakeLists.txt@1.15, 2007-08-03 11:06:49+02:00, joerg@trift2. +4 -4
    Added missing '${MYSQLD_EXE_SUFFIX}' to "mysqld" targets new in 5.1

  zlib/CMakeLists.txt@1.6, 2007-08-03 11:06:49+02:00, joerg@trift2. +1 -2
    Manual merge from 5.0 (bug#30118)

ChangeSet@1.2536.1.55, 2007-08-03 09:52:55+02:00, dfischer@bk-internal.mysql.com +2 -0
  README.txt-1:
    Rename: mysql-test/suite/funcs_1/README.txt -> mysql-test/suite/funcs_1/README.txt-1
  README.txt:
    Rename: BitKeeper/deleted/.del-README.txt -> mysql-test/suite/funcs_1/README.txt
  README.txt-old-delete:
    Rename: mysql-test/suite/funcs_1/README.txt -> mysql-test/suite/funcs_1/README.txt-old-delete
  README.txt:
    Rename: mysql-test/suite/funcs_1/README.txt-1 -> mysql-test/suite/funcs_1/README.txt
  .del-README.txt-old-delete:
    Delete: mysql-test/suite/funcs_1/README.txt-old-delete

  BitKeeper/deleted/.del-README.txt-old-delete@1.5, 2007-08-03 09:49:59+02:00, dfischer@bk-internal.mysql.com +0 -0
    Delete: mysql-test/suite/funcs_1/README.txt-old-delete

  mysql-test/suite/funcs_1/README.txt-old-delete@1.4, 2007-08-03 09:49:53+02:00, dfischer@bk-internal.mysql.com +0 -0
    Rename: mysql-test/suite/funcs_1/README.txt -> mysql-test/suite/funcs_1/README.txt-old-delete

  mysql-test/suite/funcs_1/README.txt@1.3, 2007-08-03 09:49:43+02:00, dfischer@bk-internal.mysql.com +0 -0
    Rename: BitKeeper/deleted/.del-README.txt -> mysql-test/suite/funcs_1/README.txt

  mysql-test/suite/funcs_1/README.txt@1.6, 2007-08-03 09:50:03+02:00, dfischer@bk-internal.mysql.com +0 -0
    Rename: mysql-test/suite/funcs_1/README.txt-1 -> mysql-test/suite/funcs_1/README.txt

  mysql-test/suite/funcs_1/README.txt-1@1.5, 2007-08-03 09:49:23+02:00, dfischer@bk-internal.mysql.com +0 -0
    Rename: mysql-test/suite/funcs_1/README.txt -> mysql-test/suite/funcs_1/README.txt-1

ChangeSet@1.2536.45.2, 2007-08-03 11:50:17+04:00, anozdrin@ibm. +1 -0
  Fix for BUG#30123: mysqldump is unable to work with old servers.
  
  New server (as of 5.1.21) provides new features:
    - SHOW CREATE TRIGGER;
    - character set information for SHOW TRIGGERS and SHOW CREATE
      EVENT | FUNCTION | PROCEDURE statements.
  Mysqldump uses these features to generate proper dump.
  
  The bug happened when new mysqldump was used to dump older servers.
  The problem was that 5.1.21 new features are not available, so
  mysqldump exited with error code or just crashed.
  
  The fix is to detect if mysqldump has ben run against older server
  and don't use new 5.1.21 functionality in this case. Certainly,
  the dump generated for the older server suffers from the character
  set problems fixed by BUG#16291 and the like.

  client/mysqldump.c@1.289.2.1, 2007-08-03 11:50:15+04:00, anozdrin@ibm. +369 -179
    Don't use new server features if they are not available.

ChangeSet@1.2536.43.4, 2007-08-03 08:08:33+03:00, monty@mysql.com +1 -0
  Removed compiler warning

  sql/log.cc@1.290, 2007-08-03 08:08:27+03:00, monty@mysql.com +4 -2
    Removed compiler warning

ChangeSet@1.2550, 2007-08-02 21:18:41-04:00, cbell@mysql_cab_desk. +1 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
    
  This patch removes a portion of the last patch to Field_blob::copy
  after problems found during testing of tests using distinct operations.

  sql/field.h@1.242, 2007-08-02 21:18:34-04:00, cbell@mysql_cab_desk. +1 -2
    WL#3228 (NDB) : RBR using different table defs on slave/master
      
    This patch removes a portion of the last patch to Field_blob::copy
    after problems found during testing of tests using distinct operations.
    
    The code uses the old version of teh get_length() method.

ChangeSet@1.2536.43.3, 2007-08-03 01:14:27+03:00, monty@mysql.com +11 -0
  Simplify logging code a bit (to make code smaller and  faster)
  Moved duplicated code to inline function store_timestamp()
  Save thd->time_zone_used when logging to table as CSV internally cases it to be changed
  Added MYSQL_LOCK_IGNORE_FLUSH to log tables to avoid deadlock in case of flush tables.
  Mark log tables with TIMESTAMP_NO_AUTO_SET to avoid automatic timestamping
  Set TABLE->no_replicate on open
  

  client/mysqlbinlog.cc@1.159, 2007-08-03 01:14:22+03:00, monty@mysql.com +23 -1
    Fixed several memory leaks (most in case of error situations)

  mysql-test/r/events_logs_tests.result@1.18, 2007-08-03 01:14:22+03:00, monty@mysql.com +1 -1
    Made long_query_timeout smaller to ensure next query comes into log

  mysql-test/r/variables.result@1.101, 2007-08-03 01:14:22+03:00, monty@mysql.com +1 -0
    Make it safe to run test with --log

  mysql-test/t/events_logs_tests.test@1.19, 2007-08-03 01:14:22+03:00, monty@mysql.com +1 -1
    Made long_query_timeout smaller to ensure next query comes into log

  mysql-test/t/variables.test@1.73, 2007-08-03 01:14:22+03:00, monty@mysql.com +1 -0
    Make it safe to run test with --log

  sql/field.cc@1.404.1.1, 2007-08-03 01:14:22+03:00, monty@mysql.com +3 -28
    Moved duplicated code to inline function store_timestamp()

  sql/field.h@1.238.2.2, 2007-08-03 01:14:22+03:00, monty@mysql.com +11 -0
    Moved duplicated code to inline function store_timestamp()

  sql/handler.cc@1.317.1.2, 2007-08-03 01:14:22+03:00, monty@mysql.com +4 -5
    Reorder checks in likely order
    Simplify checks if we should do binary logging
    (no_replicate is set once and for all when table is opened)

  sql/log.cc@1.289, 2007-08-03 01:14:22+03:00, monty@mysql.com +22 -14
    Save thd->time_zone_used as CVS internally cases it to be changed
    Use Field_timestamp->store_timestamp instead of automatic timestamps.
    This gives us correct timestamp even if thd->set_time() is not called (in case
    of connect) and we don't have to store thd->query_start_used anymore.

  sql/sql_base.cc@1.416.3.2, 2007-08-03 01:14:22+03:00, monty@mysql.com +20 -18
    Removed not needed comment
    Moved LINT_INIT() to after declaration
    Renamed temporary variable to avoid compiler warning
    Added MYSQL_LOCK_IGNORE_FLUSH to log tables to avoid deadlock in case of flush tables.
    Mark log tables with TIMESTAMP_NO_AUTO_SET to avoid automatic timestamping
    

  sql/table.cc@1.301.1.3, 2007-08-03 01:14:23+03:00, monty@mysql.com +2 -0
    Set TABLE->no_replicate on open

ChangeSet@1.2536.48.1, 2007-08-03 03:14:05+05:00, gluh@mysql.com +18 -0
  WL#3732 Information schema optimization

  client/mysqldump.c@1.289.1.1, 2007-08-03 03:14:02+05:00, gluh@mysql.com +2 -1
    table type compare is changed to case insensitive

  mysql-test/r/information_schema.result@1.159, 2007-08-03 03:14:02+05:00, gluh@mysql.com +29 -11
    test result

  mysql-test/r/information_schema_db.result@1.22, 2007-08-03 03:14:02+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/suite/ndb/r/ndb_alter_table.result@1.43, 2007-08-03 03:14:02+05:00, gluh@mysql.com +4 -4
    result fix

  mysql-test/suite/ndb/r/ndb_temporary.result@1.4, 2007-08-03 03:14:02+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/t/information_schema.test@1.102, 2007-08-03 03:14:02+05:00, gluh@mysql.com +20 -0
    test case

  sql/ha_ndbcluster.cc@1.468, 2007-08-03 03:14:02+05:00, gluh@mysql.com +39 -32
    char* variables are changed to LEX_STRING

  sql/ha_ndbcluster.h@1.185, 2007-08-03 03:14:02+05:00, gluh@mysql.com +1 -1
    char* variables are changed to LEX_STRING

  sql/ha_ndbcluster_binlog.cc@1.119.1.5, 2007-08-03 03:14:02+05:00, gluh@mysql.com +4 -4
    char* variables are changed to LEX_STRING

  sql/handler.cc@1.321, 2007-08-03 03:14:02+05:00, gluh@mysql.com +2 -2
    char* variables are changed to LEX_STRING

  sql/handler.h@1.274, 2007-08-03 03:14:03+05:00, gluh@mysql.com +2 -2
    char* variables are changed to LEX_STRING

  sql/sql_base.cc@1.420, 2007-08-03 03:14:03+05:00, gluh@mysql.com +10 -4
    Modified functions which are used during open table process
    according to table opening method and requested_object.

  sql/sql_select.cc@1.544.1.8, 2007-08-03 03:14:03+05:00, gluh@mysql.com +76 -30
    Add support for I_S tables into select_describe() function

  sql/sql_show.cc@1.427, 2007-08-03 03:14:03+05:00, gluh@mysql.com +1416 -836
    1. Added initialization of 'open_method' to 'st_field_info' structs.
    2. Added initialization of 'i_s_requested_object' to 'ST_SCHEMA_TABLE' structs.
    3. New function which calculates database name and table name values 
       from 'where' condition if it's possible
       void get_lookup_field_values(THD *thd, COND *cond, TABLE_LIST *table,
                                    LOOKUP_FIELD_VALUES *lookup_field_vals);
    4. New function which set table open method
       setup_table_open_method(TABLE_LIST *tables,
                               ST_SCHEMA_TABLE *schema_table,
                               enum enum_schema_tables schema_table_idx)
    5. New function
       int make_db_list(THD *thd, List<LEX_STRING> *files,
                        LOOKUP_FIELD_VALUES *lookup_field_vals,
                        bool *with_i_schema)
    6. New function
       int make_table_name_list(THD *thd, List<LEX_STRING> *files, LEX *lex,
                                LOOKUP_FIELD_VALUES *lookup_field_vals,
                                bool with_i_schema, LEX_STRING *db_name)
    7. Modified 'get_all_tables' function according to new schema(see wl#3732).

  sql/sql_show.h@1.6, 2007-08-03 03:14:03+05:00, gluh@mysql.com +1 -1
    char* variables are changed to LEX_STRING

  sql/table.cc@1.305, 2007-08-03 03:14:03+05:00, gluh@mysql.com +19 -3
    Modified functions which are used during open table process
    according to table opening method and requested_object.

  sql/table.h@1.180, 2007-08-03 03:14:03+05:00, gluh@mysql.com +12 -3
    1. added new constants(open_method)
    #define SKIP_OPEN_TABLE 0
    #define OPEN_FRM_ONLY   1
    #define OPEN_FULL_TABLE 2
        
    2. Added new field 'open_method' into struct st_field_info;
       uint open_method;
        
    3. Added new field into ST_SCHEMA_TABLE struct
       uint i_s_requested_object;  /* the object we need to open(TABLE | VIEW) */.
    4. Added new field to TABLE_LIST struct.
       uint i_s_requested_object;
       This field is set from ST_SCHEMA_TABLE.i_s_requested_object
       for processed table before opening.
        
    5. Added new fields to TABLE_LIST struct, used for 'explain select' for I_S table
       bool has_db_lookup_value;
       bool has_table_lookup_value;
       uint table_open_method;

  sql/unireg.h@1.54, 2007-08-03 03:14:03+05:00, gluh@mysql.com +5 -0
    added new constants

ChangeSet@1.2549, 2007-08-02 16:15:52-04:00, cbell@mysql_cab_desk. +6 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  This patch corrects a problem found during testing on Solaris. The code
  changes how length values are retrieved on big endian machines. The
  patch allows the rpl_extraColmaster tests to run on these machines.

  mysql-test/suite/rpl/r/rpl_row_create_table.result@1.18, 2007-08-02 16:15:03-04:00, cbell@mysql_cab_desk. +6 -6
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    New result file with changes from merge of 5.1 main.

  mysql-test/suite/rpl/t/disabled.def@1.9, 2007-08-02 16:15:43-04:00, cbell@mysql_cab_desk. +1 -0
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    Disable the rpl_rwo_extraColmaster_ndb test (WL#3915) because the code
    fails on Big Endian machines. See BUG#29549 for more details.

  sql/field.cc@1.407, 2007-08-02 16:15:43-04:00, cbell@mysql_cab_desk. +10 -7
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    This patch corrects a problem found during testing on Solaris. The code
    changes how the store_length method processes requests for values on
    big endian machines.

  sql/field.h@1.241, 2007-08-02 16:15:44-04:00, cbell@mysql_cab_desk. +14 -7
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    This patch corrects a problem found during testing on Solaris. The code
    changes how the store_length method processes requests for values on
    big endian machines. It also changes the get_packed_length() method to
    use the endian-ness of the host in getting the length + packlength.

  sql/rpl_record.cc@1.6, 2007-08-02 16:15:44-04:00, cbell@mysql_cab_desk. +30 -1
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    This patch turns on the little endian switch (db_low_byte_first) in 
    order to ensure the values are unpack correctly from binlog as they
    are stored in little endian format in binlog.

  sql/rpl_utility.cc@1.12, 2007-08-02 16:15:45-04:00, cbell@mysql_cab_desk. +36 -1
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    This patch corrects a problem found during testing on Solaris. The code
    changes how the calculated field size method processes requests for 
    values on big endian machines.

ChangeSet@1.2536.1.52, 2007-08-02 21:59:26+02:00, joerg@trift2. +1 -0
  Limit stack size of the server to 1 MB.
      
  Manual transfer of the fix for bug#20815 from 5.0 to 5.1

  CMakeLists.txt@1.28, 2007-08-02 21:59:22+02:00, joerg@trift2. +3 -0
    Limit stack size of the server to 1 MB.
    
    Manual transfer of the fix for bug#20815 from 5.0 to 5.1

ChangeSet@1.2536.47.1, 2007-08-02 15:15:48-04:00, cbell@mysql_cab_desk. +1 -0
  Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1
  into  mysql_cab_desk.:C:/source/c++/mysql-5.1

  BitKeeper/deleted/.del-.del-README.txt@1.3, 2007-08-02 15:15:37-04:00, cbell@mysql_cab_desk. +0 -0
    Delete: BitKeeper/deleted/.del-README.txt

ChangeSet@1.1810.3223.4, 2007-08-02 20:51:04+02:00, kent@mysql.com +1 -0
  make_win_bin_dist:
    Simplified copying of 'mysql-test' directory

  scripts/make_win_bin_dist@1.1.13.5, 2007-08-02 20:50:14+02:00, kent@mysql.com +28 -53
    Simplified copying of 'mysql-test' directory

ChangeSet@1.1616.3089.1, 2007-08-02 18:51:11+02:00, jperkin@production.mysql.com +1 -0
  myisamchk.c:
    Fix typo in usage.

  myisam/myisamchk.c@1.92.6.1, 2007-08-02 18:50:16+02:00, jperkin@production.mysql.com +2 -2
    Fix typo in usage.

ChangeSet@1.2536.44.4, 2007-08-02 15:37:33+02:00, kent@mysql.com +10 -0
  Makefile.am:
    Add CMakeLists.txt to source distribution
  CMakeLists.txt:
    Added missing '${MYSQLD_EXE_SUFFIX}' to "mysqld" targets new in 5.1
    Manual merge from 5.0 (bug#30118)
  CMakeLists.txt, mysqlbinlog.cc, lib_sql.cc:
    No need to test on USING_CMAKE, it is the only Windows build

  client/CMakeLists.txt@1.21.1.1, 2007-08-02 15:36:17+02:00, kent@mysql.com +26 -101
    Manual merge from 5.0 (bug#30118)

  mysys/CMakeLists.txt@1.12.1.1, 2007-08-02 15:36:31+02:00, kent@mysql.com +13 -8
    Manual merge from 5.0 (bug#30118)

  libmysql/CMakeLists.txt@1.13.2.1, 2007-08-02 15:36:30+02:00, kent@mysql.com +43 -13
    Manual merge from 5.0 (bug#30118)

  zlib/CMakeLists.txt@1.7.1.1, 2007-08-02 15:36:42+02:00, kent@mysql.com +0 -2
    Manual merge from 5.0 (bug#30118)

  sql/CMakeLists.txt@1.41.1.1, 2007-08-02 15:33:33+02:00, kent@mysql.com +4 -4
    Added missing '${MYSQLD_EXE_SUFFIX}' to "mysqld" targets new in 5.1

  client/mysqlbinlog.cc@1.157.1.1, 2007-08-02 15:26:18+02:00, kent@mysql.com +0 -8
    No need to test on USING_CMAKE, it is the only Windows build

  libmysqld/CMakeLists.txt@1.15, 2007-08-02 15:26:18+02:00, kent@mysql.com +0 -4
    No need to test on USING_CMAKE, it is the only Windows build

  libmysqld/Makefile.am@1.115, 2007-08-02 15:28:03+02:00, kent@mysql.com +1 -1
    Add CMakeLists.txt to source distribution

  libmysqld/examples/Makefile.am@1.39, 2007-08-02 15:28:03+02:00, kent@mysql.com +1 -0
    Add CMakeLists.txt to source distribution

  libmysqld/lib_sql.cc@1.137, 2007-08-02 15:26:18+02:00, kent@mysql.com +0 -4
    No need to test on USING_CMAKE, it is the only Windows build

ChangeSet@1.2536.1.46, 2007-08-02 17:14:48+05:00, ramil@mysql.com +1 -0
  After-merge fix: result adjusted.

  mysql-test/r/show_check.result@1.126, 2007-08-02 17:14:38+05:00, ramil@mysql.com +3 -0
    After-merge fix: result adjusted.

ChangeSet@1.1810.3224.1, 2007-08-02 12:49:27+02:00, kent@mysql.com +8 -0
  CMakeLists.txt (several), make_win_bin_dist:
    Aligned client library build and use with the Unix version when it
    comes to what source to include directly in the builds, and what
    libraries to link with (bug#30118).
  
    Also reviewed, corrected and made more clear when static or dynamic
    Thread Local Storage is to be used. Some code duplication was removed,
    and some redundant library usage were removed, reducing the risk of
    incorrect TLS usage.

  client/CMakeLists.txt@1.1.11.1, 2007-08-02 12:39:09+02:00, kent@mysql.com +17 -97
    - Removed code duplication by moving build of "mysqlclient" to
      the "libmysql" directory
    - Link clients with the new "mysqlclient_notls", to protect for
      the case the clients use more than the client API, and access
      thread data directly.
    - Synced explicit target addition of sources with Unix.

  dbug/CMakeLists.txt@1.1.2.1, 2007-08-02 12:39:18+02:00, kent@mysql.com +0 -1
    No need to set CXX flags, no C++ code

  libmysql/CMakeLists.txt@1.1.4.1, 2007-08-02 12:39:28+02:00, kent@mysql.com +43 -16
    - Aligned more with Unix version when it comes to included source files
    - Build both DLL and static library in this directory
    - Produce separe static TLS version of the static client library, for
       use when building clients in this build that might access TLS
       storage directly.

  mysys/CMakeLists.txt@1.1.5.1, 2007-08-02 12:39:39+02:00, kent@mysql.com +5 -9
    We only have to build the static TLS version, as no clients are
    linking directly with the "mysys" library.

  scripts/make_win_bin_dist@1.1.13.4, 2007-08-02 12:40:00+02:00, kent@mysql.com +2 -2
    Ajusted paths to new "mysqlclient.lib" location in source tree

  sql/CMakeLists.txt@1.1.9.1, 2007-08-02 12:40:15+02:00, kent@mysql.com +3 -2
    Removed duplicate "ha_blackhole.cc" in file listing
    Removed explicit link to "dbug.lib" not needed
    Link with the static TLS "mysqlclient_notls"

  tests/CMakeLists.txt@1.1.3.1, 2007-08-02 12:40:28+02:00, kent@mysql.com +4 -4
    Removed explicit link to "dbug", "mysys", "yassl", "taocrypt" and
    "zlib" not needed.
    Added explicit source addition "../mysys/my_memmem.c".
    No need for setting CXX flags, no C++ code.
    Use the static TLS "mysqlclient_notls" for linkage.

  zlib/CMakeLists.txt@1.1.2.1, 2007-08-02 12:40:37+02:00, kent@mysql.com +5 -1
    No need for a dynamic TLS version of this library, no access to thread
    storage is done from it. Also no need to define MYSQL_CLIENT, not used,
    or __WIN32__ that is handled by the library header without this define.

ChangeSet@1.2536.45.1, 2007-08-02 13:59:02+04:00, kostja@bodhi.(none) +2 -0
  Add a test case for Bug#5719 "impossible to lock VIEW".
  It has been possible to lock a view in 5.1 for some time.

  mysql-test/r/lock.result@1.21, 2007-08-02 13:59:00+04:00, kostja@bodhi.(none) +70 -0
    Update results (Bug#5719)

  mysql-test/t/lock.test@1.18, 2007-08-02 13:59:00+04:00, kostja@bodhi.(none) +65 -0
    Add a test case for Bug#5719 "impossible to lock VIEW"

ChangeSet@1.1810.3206.14, 2007-08-02 14:51:03+05:00, ramil@mysql.com +3 -0
  Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
  
  Problem: thd->thread_specific_used flag is not set executing a statement
  containig connection_id() function using PS protocol, that leads to 
  improper binlog event creation.
  
  Fix: set the flag in the Item_func_connection_id::fix_fields().

  sql/item_create.cc@1.58.1.9, 2007-08-02 14:51:00+05:00, ramil@mysql.com +0 -1
    Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
      - set the thd->thread_specific_used flag in the Item_func_connection_id::fix_fields()
        to have it properly set using PS protocol as well.

  sql/item_func.cc@1.270.1.84, 2007-08-02 14:51:00+05:00, ramil@mysql.com +1 -0
    Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
      - set the thd->thread_specific_used flag in the Item_func_connection_id::fix_fields()
        to have it properly set using PS protocol as well.

  sql/sql_parse.cc@1.426.1.208, 2007-08-02 14:51:00+05:00, ramil@mysql.com +1 -0
    Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
      - reset the thd->thread_specific_used flag in the mysql_reset_thd_for_next_command().

ChangeSet@1.2536.1.43, 2007-08-02 02:22:31-06:00, tsmith@ramayana.hindu.god +5 -0
  Post-merge fix.  Update some test results, and add an InnoDB-only
  compatibility hook, thd_mark_transaction_to_rollback().

  mysql-test/r/ps.result@1.119, 2007-08-02 02:22:29-06:00, tsmith@ramayana.hindu.god +7 -14
    Post-merge fix.   Changes for WL 3984 (Revise locking
    of mysql.general_log and mysql.slow_log) cause some test
    result differences.

  mysql-test/r/show_check.result@1.124, 2007-08-02 02:22:29-06:00, tsmith@ramayana.hindu.god +2 -5
    Post-merge fix.   Changes for WL 3984 (Revise locking
    of mysql.general_log and mysql.slow_log) cause some test
    result differences.

  sql/sql_class.cc@1.335.1.17, 2007-08-02 02:22:29-06:00, tsmith@ramayana.hindu.god +5 -0
    Post-merge fix, add InnoDB compatibility hook (defined for
    InnoDB only), thd_mark_transaction_to_rollback().

  storage/innobase/handler/ha_innodb.cc@1.355, 2007-08-02 02:22:29-06:00, tsmith@ramayana.hindu.god +3 -3
    Post-merge fix, add InnoDB compatibility hook (defined for
    InnoDB only), thd_mark_transaction_to_rollback().

  storage/innobase/handler/ha_innodb.h@1.144, 2007-08-02 02:22:29-06:00, tsmith@ramayana.hindu.god +7 -0
    Post-merge fix, add InnoDB compatibility hook (defined for
    InnoDB only), thd_mark_transaction_to_rollback().

ChangeSet@1.2536.43.2, 2007-08-02 10:50:00+03:00, monty@mysql.com +4 -0
  Don't save & restore time fields from thd when it's not needed.
  Added back setting of 'some_tables_deleted' to not cause deadlocks in mysql_lock_table()

  BitKeeper/etc/ignore@1.297, 2007-08-02 10:33:31+03:00, monty@mysql.com +1 -0
    added tests/bug25714

  sql/lock.cc@1.115, 2007-08-02 10:49:56+03:00, monty@mysql.com +4 -0
    Added comment

  sql/log.cc@1.288, 2007-08-02 10:49:56+03:00, monty@mysql.com +10 -38
    Don't save & restore time fields from thd when it's not needed.
    Fix that we properly detect if open table failed

  sql/sql_base.cc@1.416.3.1, 2007-08-02 10:49:56+03:00, monty@mysql.com +6 -0
    Added back setting of 'some_tables_deleted' to not cause deadlocks in
    mysql_lock_table()

ChangeSet@1.2536.9.6, 2007-08-02 07:49:29+03:00, monty@mysql.com +10 -0
  Set --debug-check if one uses DBUG_PUSH in all clients
  Fixed bug in query cache that made it impossible to run mysqld with --debug
  Fixed memory leaks in mysqldump and mysqltest
  Memory leaks associated with wrong usage of mysqltest is not fixed. To find these, run
  mysql-test-run --debug mysqltest

  client/mysql_upgrade.c@1.39, 2007-08-02 07:49:24+03:00, monty@mysql.com +1 -0
    Set --debug-check if one uses DBUG_PUSH

  client/mysqlcheck.c@1.66, 2007-08-02 07:49:24+03:00, monty@mysql.com +1 -0
    Set --debug-check if one uses DBUG_PUSH

  client/mysqldump.c@1.286.3.2, 2007-08-02 07:49:24+03:00, monty@mysql.com +43 -13
    Set --debug-check if one uses DBUG_PUSH
    Fixed several memory leaks

  client/mysqlimport.c@1.85, 2007-08-02 07:49:24+03:00, monty@mysql.com +1 -0
    Set --debug-check if one uses DBUG_PUSH

  client/mysqlshow.c@1.56, 2007-08-02 07:49:24+03:00, monty@mysql.com +1 -0
    Set --debug-check if one uses DBUG_PUSH

  client/mysqlslap.c@1.56.1.2, 2007-08-02 07:49:24+03:00, monty@mysql.com +1 -0
    Set --debug-check if one uses DBUG_PUSH

  client/mysqltest.c@1.307, 2007-08-02 07:49:24+03:00, monty@mysql.com +14 -10
    Set --debug-check if one uses DBUG_PUSH
    Fixed some memory leaks
    Removed MY_CHECK_ERROR argument to my_end() as mysqltest.test otherwise shows MANY memory leaks

  dbug/dbug.c@1.38, 2007-08-02 07:49:24+03:00, monty@mysql.com +3 -4
    Fixed compiler warning
    Force flush of out_file on end
    Removed some wrong dbug_flush(0) commands that could cause crashes

  mysys/my_init.c@1.61, 2007-08-02 07:49:24+03:00, monty@mysql.com +3 -3
    Don't write memory usage if MY_GIVE_INFO is not given

  sql/sql_cache.cc@1.117.1.1, 2007-08-02 07:49:24+03:00, monty@mysql.com +4 -3
    Fixed bug in query cache that made it impossible to run mysqld with --debug

ChangeSet@1.1810.3217.3, 2007-08-02 03:32:54+04:00, kostja@bodhi.(none) +2 -0
  Add a test case for Bug#18287 create federated table always times out,
   error 1159 ' ' (fixed by the patch for Bug 25679)

  mysql-test/r/federated.result@1.25.10.2, 2007-08-02 03:32:53+04:00, kostja@bodhi.(none) +14 -0
    Update results (Bug#18287)

  mysql-test/t/federated.test@1.19.8.2, 2007-08-02 03:32:53+04:00, kostja@bodhi.(none) +14 -0
    Add a test case for Bug#18287 create federated table always times out,
     error 1159 ' '

ChangeSet@1.2536.40.7, 2007-08-01 16:45:55-06:00, tsmith@ramayana.hindu.god +2 -0
  Remove some redundant or unused code from InnoDB (feedback from
  Marko after applying latest snapshot).

  storage/innobase/handler/ha_innodb.cc@1.353, 2007-08-01 16:45:49-06:00, tsmith@ramayana.hindu.god +0 -2
    Remove redundant assignment to thd_to_trx(thd); trx is
    declared as a reference to thd_to_trx(thd) at the top
    of the function, so this assignment isn't useful.

  storage/innobase/include/trx0trx.h@1.60, 2007-08-01 16:45:49-06:00, tsmith@ramayana.hindu.god +0 -8
    Remove two unused members from struct trx_struct.  allow_duplicates
    and replace_duplicates are not used; a single duplicates member is
    used instead to represent both flags.

ChangeSet@1.2536.9.5, 2007-08-01 22:59:05+03:00, monty@mysql.com +24 -0
  Fixes Bug#30127: --debug-info no longer prints memory usage in mysql
  Fixed compiler warnings, errors and link errors
  Fixed new bug on Solaris with gethrtime()
  Added --debug-check option to all mysql clients to print errors and memory leaks
  Added --debug-info to all clients. This now works as --debug-check but also prints memory and cpu usage

  BUILD/compile-solaris-sparc-debug@1.7, 2007-08-01 22:58:59+03:00, monty@mysql.com +1 -1
    Remove old cpu options

  client/client_priv.h@1.71.1.1, 2007-08-01 22:58:59+03:00, monty@mysql.com +2 -2
    Added OPT_DBUG_CHECK

  client/mysql.cc@1.267, 2007-08-01 22:58:59+03:00, monty@mysql.com +16 -7
    --debug-info now prints memory usage 
    Added --debug-check

  client/mysql_upgrade.c@1.38, 2007-08-01 22:58:59+03:00, monty@mysql.com +23 -10
    --debug-info now prints memory usage 
    Added --debug-check

  client/mysqladmin.cc@1.122, 2007-08-01 22:58:59+03:00, monty@mysql.com +17 -6
    --debug-info now prints memory usage 
    Added --debug-check

  client/mysqlbinlog.cc@1.158, 2007-08-01 22:58:59+03:00, monty@mysql.com +16 -7
    --debug-info now prints memory usage 
    Added --debug-check

  client/mysqlcheck.c@1.65, 2007-08-01 22:58:59+03:00, monty@mysql.com +15 -6
    --debug-info now prints memory usage 
    Added --debug-check

  client/mysqldump.c@1.286.3.1, 2007-08-01 22:58:59+03:00, monty@mysql.com +16 -7
    --debug-info now prints memory usage 
    Added --debug-check

  client/mysqlimport.c@1.84, 2007-08-01 22:59:00+03:00, monty@mysql.com +14 -6
    --debug-info now prints memory usage 
    Added --debug-check

  client/mysqlshow.c@1.55, 2007-08-01 22:59:00+03:00, monty@mysql.com +15 -5
    --debug-info now prints memory usage 
    Added --debug-check

  client/mysqlslap.c@1.56.1.1, 2007-08-01 22:59:00+03:00, monty@mysql.com +15 -7
    --debug-info now prints memory usage 
    Added --debug-check

  client/mysqltest.c@1.306, 2007-08-01 22:59:00+03:00, monty@mysql.com +15 -4
    --debug-info now prints memory usage 
    Added --debug-check

  include/my_sys.h@1.226, 2007-08-01 22:59:00+03:00, monty@mysql.com +2 -2
    Added extra option to TERMINATE to not print statistics

  libmysql/libmysql.c@1.287, 2007-08-01 22:59:00+03:00, monty@mysql.com +1 -1
    Fixed compiler warning

  mysql-test/mysql-test-run.pl@1.316.1.1, 2007-08-01 22:59:00+03:00, monty@mysql.com +6 -6
    --debug-info -> --debug-check to not print memory usage

  mysys/my_getsystime.c@1.9, 2007-08-01 22:59:00+03:00, monty@mysql.com +40 -28
    Moved fast time calculation to my_micro_time_and_time()
    Fixed bug in previous push related to HAVE_GETHRTIME

  mysys/my_init.c@1.60, 2007-08-01 22:59:00+03:00, monty@mysql.com +8 -3
    Print not freed memory in my_end() if MY_CHECK_ERROR is given

  mysys/my_static.c@1.24, 2007-08-01 22:59:00+03:00, monty@mysql.com +0 -2
    Cleanup

  mysys/safemalloc.c@1.34, 2007-08-01 22:59:00+03:00, monty@mysql.com +10 -8
    Added extra option to TERMINATE to not print statistics

  sql/item_xmlfunc.cc@1.32, 2007-08-01 22:59:00+03:00, monty@mysql.com +2 -2
    Fixed compiler warning

  sql/sql_test.cc@1.55, 2007-08-01 22:59:00+03:00, monty@mysql.com +1 -1
    Fixed TERMINATE() call

  unittest/mysys/base64-t.c@1.9, 2007-08-01 22:59:00+03:00, monty@mysql.com +2 -0
    Fixed link error

  unittest/mysys/bitmap-t.c@1.6, 2007-08-01 22:59:00+03:00, monty@mysql.com +5 -4
    Fixed link error

  unittest/mysys/my_atomic-t.c@1.11, 2007-08-01 22:59:00+03:00, monty@mysql.com +2 -1
    Fixed link error

ChangeSet@1.2536.1.36, 2007-08-01 22:40:04+04:00, kostja@bodhi.(none) +1 -0
  Fix a valgrind warning. For some reason it never popped up before.

  sql/sql_class.cc@1.335.7.1, 2007-08-01 22:40:00+04:00, kostja@bodhi.(none) +1 -0
    Fix a valgrind warning (row_count_func is used before it was initialized
    in SQLCOM_CALL)

ChangeSet@1.2536.40.6, 2007-08-01 19:20:25+05:00, ramil@mysql.com +7 -0
  After-merge fixup.
    - THD::tmp_table_used removed, THD::thread_specific_used used instead.

  sql/item_create.cc@1.89, 2007-08-01 19:20:20+05:00, ramil@mysql.com +1 -0
    After-merge fixup.
      - THD::tmp_table_used removed, THD::thread_specific_used used instead.

  sql/log_event.cc@1.291.2.2, 2007-08-01 19:20:20+05:00, ramil@mysql.com +3 -5
    After-merge fixup.
      - THD::tmp_table_used removed, THD::thread_specific_used used instead.

  sql/sql_base.cc@1.416.2.1, 2007-08-01 19:20:20+05:00, ramil@mysql.com +1 -1
    After-merge fixup.
      - THD::tmp_table_used removed, THD::thread_specific_used used instead.

  sql/sql_class.cc@1.335.6.2, 2007-08-01 19:20:20+05:00, ramil@mysql.com +1 -1
    After-merge fixup.
      - THD::tmp_table_used removed, THD::thread_specific_used used instead.

  sql/sql_class.h@1.386.2.2, 2007-08-01 19:20:20+05:00, ramil@mysql.com +0 -1
    After-merge fixup.
      - THD::tmp_table_used removed, THD::thread_specific_used used instead.

  sql/sql_parse.cc@1.694.3.1, 2007-08-01 19:20:20+05:00, ramil@mysql.com +1 -1
    After-merge fixup.
      - THD::tmp_table_used removed, THD::thread_specific_used used instead.

  sql/sql_table.cc@1.442.2.3, 2007-08-01 19:20:20+05:00, ramil@mysql.com +2 -2
    After-merge fixup.
      - THD::tmp_table_used removed, THD::thread_specific_used used instead.

ChangeSet@1.2536.34.4, 2007-08-01 15:20:11+02:00, joerg@trift2. +30 -0
  Fix a bad BitKeeper dependency structure for the "funcs_2" suite:
  
  The files below "mysql-test/suite/funcs_2" in version 5.1
  did not depend on the equivalent ones in 5.0,
  probably because they had been checked in independent of each other
  in both versions.
  
  Foreach file F in the suite that has a "deleted" counterpart D, use
      bk rm $F
      bk mv $D $F
      bk edit $F
  to get those files into the 5.1 suite that (for BK) depend on 5.0.
  
  There is only one file whose contents differs between 5.0 and 5.1,
  restore its current 5.1 contents:
     mysql-test/suite/funcs_2/r/ndb_charset.result

  BitKeeper/deleted/.del-charset_master.test~3ac6827798431a7@1.2, 2007-08-01 15:04:16+02:00, joerg@trift2. +0 -0
    Delete: mysql-test/suite/funcs_2/charset/charset_master.test

  BitKeeper/deleted/.del-charset_utf8.txt~c8409ddc3d216d4@1.2, 2007-08-01 15:04:17+02:00, joerg@trift2. +0 -0
    Delete: mysql-test/suite/funcs_2/data/charset_utf8.txt

  BitKeeper/deleted/.del-check_charset.inc~1328722ebe51ab2b@1.2, 2007-08-01 15:04:17+02:00, joerg@trift2. +0 -0
    Delete: mysql-test/suite/funcs_2/include/check_charset.inc

  BitKeeper/deleted/.del-check_charset_ucs2.inc~fbcdbb34f38ce9f1@1.2, 2007-08-01 15:04:18+02:00, joerg@trift2. +0 -0
    Delete: mysql-test/suite/funcs_2/include/check_charset_ucs2.inc

  BitKeeper/deleted/.del-check_charset_utf8.inc~703a0b77d86f514e@1.2, 2007-08-01 15:04:18+02:00, joerg@trift2. +0 -0
    Delete: mysql-test/suite/funcs_2/include/check_charset_utf8.inc

  BitKeeper/deleted/.del-gen_charset_utf8.pl~ff00332572f0f0b6@1.2, 2007-08-01 15:04:18+02:00, joerg@trift2. +0 -0
    Delete: mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl

  BitKeeper/deleted/.del-innodb_charset.result~5a9b45c455263e16@1.2, 2007-08-01 15:04:19+02:00, joerg@trift2. +0 -0
    Delete: mysql-test/suite/funcs_2/r/innodb_charset.result

  BitKeeper/deleted/.del-innodb_charset.test~4555b7e4a5caa39@1.2, 2007-08-01 15:04:21+02:00, joerg@trift2. +0 -0
    Delete: mysql-test/suite/funcs_2/t/innodb_charset.test

  BitKeeper/deleted/.del-memory_charset.result~3e27ebf0471b3472@1.2, 2007-08-01 15:04:19+02:00, joerg@trift2. +0 -0
    Delete: mysql-test/suite/funcs_2/r/memory_charset.result

  BitKeeper/deleted/.del-memory_charset.test~4f055ebb453f58fd@1.2, 2007-08-01 15:04:22+02:00, joerg@trift2. +0 -0
    Delete: mysql-test/suite/funcs_2/t/memory_charset.test

  BitKeeper/deleted/.del-myisam_charset.result~e86d46123a579771@1.2, 2007-08-01 15:04:20+02:00, joerg@trift2. +0 -0
    Delete: mysql-test/suite/funcs_2/r/myisam_charset.result

  BitKeeper/deleted/.del-myisam_charset.test~f859c5b56700de58@1.2, 2007-08-01 15:04:22+02:00, joerg@trift2. +0 -0
    Delete: mysql-test/suite/funcs_2/t/myisam_charset.test

  BitKeeper/deleted/.del-ndb_charset.result~37be292ee7801689@1.2, 2007-08-01 15:04:20+02:00, joerg@trift2. +0 -0
    Delete: mysql-test/suite/funcs_2/r/ndb_charset.result

  BitKeeper/deleted/.del-ndb_charset.test~354cbaeb1bc2f75d@1.2, 2007-08-01 15:04:23+02:00, joerg@trift2. +0 -0
    Delete: mysql-test/suite/funcs_2/t/ndb_charset.test

  BitKeeper/deleted/.del-readme.txt~e8399f1a3f34d433@1.2, 2007-08-01 15:04:23+02:00, joerg@trift2. +0 -0
    Delete: mysql-test/suite/funcs_2/readme.txt

  mysql-test/suite/funcs_2/charset/charset_master.test@1.3, 2007-08-01 15:04:16+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-charset_master.test -> mysql-test/suite/funcs_2/charset/charset_master.test

  mysql-test/suite/funcs_2/data/charset_utf8.txt@1.3, 2007-08-01 15:04:17+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-charset_utf8.txt -> mysql-test/suite/funcs_2/data/charset_utf8.txt

  mysql-test/suite/funcs_2/include/check_charset.inc@1.3, 2007-08-01 15:04:17+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-check_charset.inc -> mysql-test/suite/funcs_2/include/check_charset.inc

  mysql-test/suite/funcs_2/include/check_charset_ucs2.inc@1.3, 2007-08-01 15:04:18+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-check_charset_ucs2.inc -> mysql-test/suite/funcs_2/include/check_charset_ucs2.inc

  mysql-test/suite/funcs_2/include/check_charset_utf8.inc@1.3, 2007-08-01 15:04:18+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-check_charset_utf8.inc -> mysql-test/suite/funcs_2/include/check_charset_utf8.inc

  mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl@1.3, 2007-08-01 15:04:19+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-gen_charset_utf8.pl -> mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl

  mysql-test/suite/funcs_2/r/innodb_charset.result@1.3, 2007-08-01 15:04:19+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-innodb_charset.result -> mysql-test/suite/funcs_2/r/innodb_charset.result

  mysql-test/suite/funcs_2/r/memory_charset.result@1.3, 2007-08-01 15:04:20+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-memory_charset.result -> mysql-test/suite/funcs_2/r/memory_charset.result

  mysql-test/suite/funcs_2/r/myisam_charset.result@1.3, 2007-08-01 15:04:20+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-myisam_charset.result -> mysql-test/suite/funcs_2/r/myisam_charset.result

  mysql-test/suite/funcs_2/r/ndb_charset.result@1.4, 2007-08-01 15:19:59+02:00, joerg@trift2. +124 -124
    Fix a bad BitKeeper dependency structure for the "funcs_2" suite:
    
    Restore the 5.1 contents into the 5.0-dependent file.

  mysql-test/suite/funcs_2/r/ndb_charset.result@1.3, 2007-08-01 15:04:20+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-ndb_charset.result -> mysql-test/suite/funcs_2/r/ndb_charset.result

  mysql-test/suite/funcs_2/readme.txt@1.3, 2007-08-01 15:04:23+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-readme.txt~2 -> mysql-test/suite/funcs_2/readme.txt

  mysql-test/suite/funcs_2/t/innodb_charset.test@1.3, 2007-08-01 15:04:22+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-innodb_charset.test -> mysql-test/suite/funcs_2/t/innodb_charset.test

  mysql-test/suite/funcs_2/t/memory_charset.test@1.3, 2007-08-01 15:04:22+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-memory_charset.test -> mysql-test/suite/funcs_2/t/memory_charset.test

  mysql-test/suite/funcs_2/t/myisam_charset.test@1.3, 2007-08-01 15:04:22+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-myisam_charset.test -> mysql-test/suite/funcs_2/t/myisam_charset.test

  mysql-test/suite/funcs_2/t/ndb_charset.test@1.3, 2007-08-01 15:04:23+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-ndb_charset.test -> mysql-test/suite/funcs_2/t/ndb_charset.test

ChangeSet@1.2536.1.35, 2007-08-01 16:48:14+04:00, kostja@bodhi.(none) +2 -0
  Fix an unstable test.

  mysql-test/r/log_tables.result@1.21, 2007-08-01 16:48:08+04:00, kostja@bodhi.(none) +17 -12
    Update results.

  mysql-test/t/log_tables.test@1.19, 2007-08-01 16:48:09+04:00, kostja@bodhi.(none) +18 -12
    Silence a race condition: TRUNCATE code issues mysql_frm_type without
    a metadata lock, and finds no table if hits the moment when
    ALTER is swapping two tables.

ChangeSet@1.1810.3200.2, 2007-08-01 15:27:03+05:00, ramil@mysql.com +7 -0
  Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
  restores from mysqlbinlog out
  
  Problem: using "mysqlbinlog | mysql" for recoveries the connection_id() 
  result may differ from what was used when issuing the statement.
  
  Fix: if there is a connection_id() in a statement, write to binlog
  SET pseudo_thread_id= XXX; before it and use the value later on.

  mysql-test/r/mysqlbinlog.result@1.25.1.11, 2007-08-01 15:27:00+05:00, ramil@mysql.com +7 -0
    Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
    restores from mysqlbinlog out
      - test result.

  mysql-test/t/mysqlbinlog.test@1.21.1.29, 2007-08-01 15:27:00+05:00, ramil@mysql.com +21 -0
    Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
    restores from mysqlbinlog out
      - test case.

  sql/item_create.cc@1.58.1.8, 2007-08-01 15:27:00+05:00, ramil@mysql.com +3 -1
    Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
    restores from mysqlbinlog out
      - set thread_specific_used flag for the connection_id() function.

  sql/item_func.cc@1.270.71.1, 2007-08-01 15:27:00+05:00, ramil@mysql.com +1 -10
    Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
    restores from mysqlbinlog out
      - always return thd->variables.pseudo_thread_id as a connection_id() 
    result, as it contains a proper value for both master and slave.

  sql/log_event.cc@1.174.1.63, 2007-08-01 15:27:00+05:00, ramil@mysql.com +7 -4
    Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
    restores from mysqlbinlog out
      - set LOG_EVENT_THREAD_SPECIFIC_F event flag if thread_specific_used
    is set.

  sql/sql_class.cc@1.223.33.1, 2007-08-01 15:27:00+05:00, ramil@mysql.com +1 -1
    Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
    restores from mysqlbinlog out
      - thd->thread_specific_used introduced, which is set if thread specific 
    value(s) used in a statement.

  sql/sql_class.h@1.230.78.1, 2007-08-01 15:27:00+05:00, ramil@mysql.com +3 -0
    Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
    restores from mysqlbinlog out
      - thd->thread_specific_used introduced, which is set if thread specific 
    value(s) used in a statement.

ChangeSet@1.1616.3081.2, 2007-08-01 11:58:25+02:00, jperkin@production.mysql.com +1 -0
  Option 6 tries to grant global privileges at the database level
  which does not work.  Removing these attempted privileges makes
  this identical to option 5 so remove it completely.  The spirit
  of the program appears to be aimed at database privileges, so do
  not add another option for granting global privileges as it may
  be unexpected.  Fixes bug#14618 (same as previous patch, this
  time applied to -maint tree).

  scripts/mysql_setpermission.sh@1.5, 2007-08-01 11:48:53+02:00, jperkin@production.mysql.com +8 -14
    Option 6 tries to apply global privileges at the database
    level which does not work - remove it.

ChangeSet@1.1616.3086.1, 2007-08-01 11:54:24+02:00, istruewing@chilla.local +1 -0
  Bug#29838 - myisam corruption using concurrent select ... and update
  
  When using concurrent insert with parallel index reads, it could
  happen that reading sessions found keys that pointed to records
  yet to be written to the data file. The result was a report of
  a corrupted table. But it was false alert.
  
  When inserting a record in a table with indexes, the keys are
  inserted into the indexes before the record is written to the data
  file. When the insert happens concurrently to selects, an
  index read can find a key that references the record that is not
  yet written to the data file. To avoid any access to such record,
  the select saves the current end of file position when it starts.
  Since concurrent inserts are always appended at end of the data
  file, the select can easily ignore any concurrently inserted record.
  
  The problem was that the ignore was only done for non-exact key
  searches (partial key or using >, >=, < or <=).
  
  The fix is to ignore concurrently inserted records also for
  exact key searches.
  
  No test case. Concurrent inserts cannot be tested with the test
  suite. Test cases are attached to the bug report.

  myisam/mi_rkey.c@1.16.1.10, 2007-08-01 11:54:13+02:00, istruewing@chilla.local +51 -30
    Bug#29838 - myisam corruption using concurrent select ... and update
    Fixed mi_rkey() to always ignore records beyond saved eof.

ChangeSet@1.1810.3217.2, 2007-08-01 12:28:08+04:00, kostja@bodhi.(none) +2 -0
  Fix an unstable test. It was reliant on the current time.

  mysql-test/r/func_time.result@1.47.1.35, 2007-08-01 12:28:03+04:00, kostja@bodhi.(none) +4 -4
    Update results (use fixed datetime values instead of NOW()).

  mysql-test/t/func_time.test@1.41.1.28, 2007-08-01 12:28:03+04:00, kostja@bodhi.(none) +4 -4
    Use fixed datetime values instead of NOW(): the test would have a sporadic
    failure when current day changed between two consequtive calls to
    NOW(). The test actually tests FROM_DAYS/TO_DAYS functions, 
    so use of NOW() is not necessary.

ChangeSet@1.2529.44.2, 2007-08-01 09:24:01+02:00, tnurnberg@sin.intern.azundris.com +7 -0
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2
  
  5.1 specific fixes so cluster will build on AIX (with IBM compiler)

  config/ac-macros/ha_ndbcluster.m4@1.28, 2007-08-01 09:23:54+02:00, tnurnberg@sin.intern.azundris.com +7 -0
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (1)
    
    build NDB binaries as static on AIX. because that actually
    *works*.
    
    when building dynamic, with the IBM compiler (xlC_r), and
    the build breaks on AIX due to missing symbols
    (__vec__delete2 et al.), try adding -lhC to the Makefile.

  storage/ndb/src/mgmclient/Makefile.am@1.23, 2007-08-01 09:23:54+02:00, tnurnberg@sin.intern.azundris.com +1 -1
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2)
    
    fix path

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@1.118, 2007-08-01 09:23:54+02:00, tnurnberg@sin.intern.azundris.com +1 -1
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (3)
    
    __align is a keyword in xlC_r

  storage/ndb/test/ndbapi/testIndexStat.cpp@1.4, 2007-08-01 09:23:54+02:00, tnurnberg@sin.intern.azundris.com +15 -15
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
    
    gptr is now uchar*
    
    template can't be static on xlC_r?

  storage/ndb/test/ndbapi/test_event_merge.cpp@1.16, 2007-08-01 09:23:55+02:00, tnurnberg@sin.intern.azundris.com +17 -17
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
    
    gptr is now uchar*

  storage/ndb/test/run-test/main.cpp@1.33, 2007-08-01 09:23:55+02:00, tnurnberg@sin.intern.azundris.com +18 -18
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
    
    gptr is now uchar*

  storage/ndb/test/src/NDBT_Test.cpp@1.37, 2007-08-01 09:23:55+02:00, tnurnberg@sin.intern.azundris.com +10 -10
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
    
    gptr is now uchar*

ChangeSet@1.1810.3202.2, 2007-08-01 11:41:13+05:00, ramil@mysql.com +4 -0
  Fix for bug #30088: Can't disable myisam-recover by a value of "".
    - test result.
  
  Problem: we don't proper handle "" value of the --myisam-recover option.
  
  Fix: turn off myisam recovering if --myisam-recover="" is set.

  mysql-test/r/show_check.result@1.75.2.1, 2007-08-01 11:41:04+05:00, ramil@mysql.com +3 -0
    Fix for bug #30088: Can't disable myisam-recover by a value of "".
      - test result.

  mysql-test/t/show_check-master.opt@1.4, 2007-08-01 11:41:04+05:00, ramil@mysql.com +1 -1
    Fix for bug #30088: Can't disable myisam-recover by a value of "".
      - test case.

  mysql-test/t/show_check.test@1.54.3.1, 2007-08-01 11:41:04+05:00, ramil@mysql.com +5 -0
    Fix for bug #30088: Can't disable myisam-recover by a value of "".
      - test case.

  sql/mysqld.cc@1.439.1.181, 2007-08-01 11:41:04+05:00, ramil@mysql.com +6 -1
    Fix for bug #30088: Can't disable myisam-recover by a value of "".
      - turn off myisam recovering if --myisam-recover="" is passed.

ChangeSet@1.1810.3219.1, 2007-08-01 04:56:58+02:00, tnurnberg@sin.intern.azundris.com +16 -0
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2
  
  mysqld hasn't been built on AIX with ndb-everything in quite a while.
  this allowed a variety of changes to be added that broke the AIX build
  for both the GNU and IBM compilers (but the IBM suite in particular).
  Changeset lets build to complete on AIX 5.2 for users of the GNU and
  the IBM suite both. Tudo bem?

  config/ac-macros/large_file.m4@1.3, 2007-08-01 04:56:48+02:00, tnurnberg@sin.intern.azundris.com +3 -8
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2)
    
    we no longer declare anything large-file on AIX.  the
    GNU C++ compiler declares _LARGE_FILE_API all of its
    own, and either way we're now pulling in <standards.h>
    when on AIX, which defines _LARGE_FILE_API (if not
    already defined).

  configure.in@1.245.99.2, 2007-08-01 04:56:48+02:00, tnurnberg@sin.intern.azundris.com +6 -0
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (1)
    
    build NDB binaries as static on AIX. because that actually
    *works*.
    
    when building dynamic, with the IBM compiler (xlC_r), and
    the build breaks on AIX due to missing symbols
    (__vec__delete2 et al.), try adding -lhC to the Makefile.

  include/mysql.h@1.154.7.5, 2007-08-01 04:56:48+02:00, tnurnberg@sin.intern.azundris.com +4 -0
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2)
    
    we're now pulling in <standards.h> when on AIX, which
    defines _LARGE_FILE_API (if not already defined).

  ndb/src/common/util/File.cpp@1.8.17.1, 2007-08-01 04:56:48+02:00, tnurnberg@sin.intern.azundris.com +2 -2
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (3)
    
    do not de-scope the standards, for they may be funky macros

  ndb/src/mgmclient/Makefile.am@1.17.3.1, 2007-08-01 04:56:48+02:00, tnurnberg@sin.intern.azundris.com +1 -0
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
    
    make IBM C++ compiler happy on AIX

  ndb/src/mgmsrv/Makefile.am@1.22.3.1, 2007-08-01 04:56:48+02:00, tnurnberg@sin.intern.azundris.com +1 -1
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (5)
    
    GNU compiler has no sense of humour about this

  ndb/test/ndbapi/benchronja.cpp@1.6.2.1, 2007-08-01 04:56:48+02:00, tnurnberg@sin.intern.azundris.com +13 -6
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
    
    MAXTHREADS collides with a #define from <sys/thread.h> on AIX
    (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
    #undef it here lest someone use it by habit and get really funny
    results.  (K&R says we may #undef non-existent symbols.)

  ndb/test/ndbapi/flexAsynch.cpp@1.12.2.1, 2007-08-01 04:56:48+02:00, tnurnberg@sin.intern.azundris.com +13 -6
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
    
    MAXTHREADS collides with a #define from <sys/thread.h> on AIX
    (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
    #undef it here lest someone use it by habit and get really funny
    results.  (K&R says we may #undef non-existent symbols.)

  ndb/test/ndbapi/flexHammer.cpp@1.11.2.1, 2007-08-01 04:56:48+02:00, tnurnberg@sin.intern.azundris.com +11 -4
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
    
    MAXTHREADS collides with a #define from <sys/thread.h> on AIX
    (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
    #undef it here lest someone use it by habit and get really funny
    results.  (K&R says we may #undef non-existent symbols.)

  ndb/test/ndbapi/flexScan.cpp@1.9.4.1, 2007-08-01 04:56:48+02:00, tnurnberg@sin.intern.azundris.com +9 -2
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
    
    MAXTHREADS collides with a #define from <sys/thread.h> on AIX
    (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
    #undef it here lest someone use it by habit and get really funny
    results.  (K&R says we may #undef non-existent symbols.)

  ndb/test/ndbapi/flexTT.cpp@1.11.2.1, 2007-08-01 04:56:48+02:00, tnurnberg@sin.intern.azundris.com +13 -6
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
    
    MAXTHREADS collides with a #define from <sys/thread.h> on AIX
    (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
    #undef it here lest someone use it by habit and get really funny
    results.  (K&R says we may #undef non-existent symbols.)

  ndb/test/ndbapi/flexTimedAsynch.cpp@1.4.2.1, 2007-08-01 04:56:48+02:00, tnurnberg@sin.intern.azundris.com +15 -8
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
    
    MAXTHREADS collides with a #define from <sys/thread.h> on AIX
    (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
    #undef it here lest someone use it by habit and get really funny
    results.  (K&R says we may #undef non-existent symbols.)

  ndb/test/ndbapi/initronja.cpp@1.5.2.1, 2007-08-01 04:56:48+02:00, tnurnberg@sin.intern.azundris.com +8 -1
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
    
    MAXTHREADS collides with a #define from <sys/thread.h> on AIX
    (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
    #undef it here lest someone use it by habit and get really funny
    results.  (K&R says we may #undef non-existent symbols.)

  ndb/test/ndbapi/testOperations.cpp@1.8.4.1, 2007-08-01 04:56:48+02:00, tnurnberg@sin.intern.azundris.com +0 -5
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (7)
    
    IBM C compiler on AIX is not happy with the re-def.

  ndb/test/ndbapi/testScanFilter.cpp@1.1.3.1, 2007-08-01 04:56:48+02:00, tnurnberg@sin.intern.azundris.com +10 -2
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (8)
    
    The IBM C++ compiler on AIX doesn't like initializing from pow().
    This works, but breaks a VAL (bool res_cal[TUPLE_NUM] ...) later on.

  ndb/test/odbc/SQL99_test/SQL99_test.cpp@1.1.2.1, 2007-08-01 04:56:48+02:00, tnurnberg@sin.intern.azundris.com +10 -3
    Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
    
    MAXTHREADS collides with a #define from <sys/thread.h> on AIX
    (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
    #undef it here lest someone use it by habit and get really funny
    results.  (K&R says we may #undef non-existent symbols.)

ChangeSet@1.2536.12.10, 2007-07-31 16:36:29-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #29419 "Specifying a join_buffer > 4GB on 64 bit machines not possible."
    
  Use size_t instead of uint when calculating join buffer size, because uint can be overflown on 64-bit platforms and join_buffer_size > 4 GB.
    
  The test case for this bug is a part of the test suite for bug #5731.

  sql/sql_select.cc@1.544.2.1, 2007-07-31 16:36:21-04:00, dkatz@damien-katzs-computer.local +4 -3
    Use size_t instead of uint when calculating join buffer size, because uint can be overflown on 64-bit platforms and join_buffer_size > 4G.

ChangeSet@1.2536.39.1, 2007-07-31 19:35:13+02:00, joerg@trift2. +38 -0
  Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files.
  
  They had been introduced in 5.1 and were only later backported to 5.0;
  as a consequence, the files in the 5.1 tree do not depend on the 5.0 ones,
  and changes in 5.0 do not propagate into the 5.1 files.
  
  To fix this, the (previous) files in 5.1 now are deleted ("bk rm"),
  and the previously deleted files depending on 5.0 are now moved to the 
  respective source directories ("bk mv").
  The current 5.1 contents is restored in these files.
  
  If you need the previous history of the 5.1 files ("bk revtool"),
  access those in "BitKeeper/deleted".
  
  Contrary to the original plan, I did not introduce the name
  "CMakeLists.historic" - mostly in order not to clutter the source tree.
  
  This fixes bug#29982.

  BitKeeper/deleted/.del-CMakeLists.txt~1960eb07@1.13, 2007-07-31 19:03:46+02:00, joerg@trift2. +0 -0
    Delete: storage/innobase/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~2a609d33@1.8, 2007-07-31 19:03:49+02:00, joerg@trift2. +0 -0
    Delete: vio/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b@1.22, 2007-07-31 19:03:39+02:00, joerg@trift2. +0 -0
    Delete: client/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~57492bba@1.15, 2007-07-31 19:03:41+02:00, joerg@trift2. +0 -0
    Delete: extra/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~5b8836e4@1.36, 2007-07-31 19:03:39+02:00, joerg@trift2. +0 -0
    Delete: CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~5fa65a12@1.9, 2007-07-31 19:03:47+02:00, joerg@trift2. +0 -0
    Delete: strings/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~86a68ea1@1.13, 2007-07-31 19:03:44+02:00, joerg@trift2. +0 -0
    Delete: mysys/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~8c35983c@1.8, 2007-07-31 19:03:41+02:00, joerg@trift2. +0 -0
    Delete: extra/yassl/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~93f0d646@1.7, 2007-07-31 19:03:40+02:00, joerg@trift2. +0 -0
    Delete: dbug/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~95969b72@1.11, 2007-07-31 19:03:45+02:00, joerg@trift2. +0 -0
    Delete: server-tools/instance-manager/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~96726c3b@1.11, 2007-07-31 19:03:46+02:00, joerg@trift2. +0 -0
    Delete: storage/myisam/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~99a50df6@1.13.1.1, 2007-07-31 19:03:43+02:00, joerg@trift2. +0 -0
    Delete: libmysql/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~9e206e11@1.8, 2007-07-31 19:03:44+02:00, joerg@trift2. +0 -0
    Delete: regex/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~bb293bb4@1.9, 2007-07-31 19:03:46+02:00, joerg@trift2. +0 -0
    Delete: storage/heap/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~c3563d5f@1.10, 2007-07-31 19:03:42+02:00, joerg@trift2. +0 -0
    Delete: extra/yassl/taocrypt/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~ef945345@1.8, 2007-07-31 19:03:50+02:00, joerg@trift2. +0 -0
    Delete: zlib/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~fb3a3a47@1.10, 2007-07-31 19:03:47+02:00, joerg@trift2. +0 -0
    Delete: storage/myisammrg/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~fc201a06@1.8.1.1, 2007-07-31 19:03:48+02:00, joerg@trift2. +0 -0
    Delete: tests/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~fdec1f01@1.43, 2007-07-31 19:03:45+02:00, joerg@trift2. +0 -0
    Delete: sql/CMakeLists.txt

  CMakeLists.txt@1.26, 2007-07-31 19:34:31+02:00, joerg@trift2. +95 -63
    Restore the current 5.1 contents into the 5.0-dependent file.
    
    For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".

  CMakeLists.txt@1.25, 2007-07-31 19:03:39+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~1 -> CMakeLists.txt

  client/CMakeLists.txt@1.14, 2007-07-31 19:34:31+02:00, joerg@trift2. +13 -11
    Restore the current 5.1 contents into the 5.0-dependent file.
    
    For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".

  client/CMakeLists.txt@1.13, 2007-07-31 19:03:40+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~7 -> client/CMakeLists.txt

  dbug/CMakeLists.txt@1.4, 2007-07-31 19:03:40+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~9 -> dbug/CMakeLists.txt

  extra/CMakeLists.txt@1.8, 2007-07-31 19:34:32+02:00, joerg@trift2. +1 -3
    Restore the current 5.1 contents into the 5.0-dependent file.
    
    For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".

  extra/CMakeLists.txt@1.7, 2007-07-31 19:03:41+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~10 -> extra/CMakeLists.txt

  extra/yassl/CMakeLists.txt@1.5, 2007-07-31 19:03:42+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~11 -> extra/yassl/CMakeLists.txt

  extra/yassl/taocrypt/CMakeLists.txt@1.5, 2007-07-31 19:03:42+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~12 -> extra/yassl/taocrypt/CMakeLists.txt

  libmysql/CMakeLists.txt@1.7, 2007-07-31 19:34:32+02:00, joerg@trift2. +2 -5
    Restore the current 5.1 contents into the 5.0-dependent file.
    
    For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".

  libmysql/CMakeLists.txt@1.6, 2007-07-31 19:03:43+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~13 -> libmysql/CMakeLists.txt

  mysys/CMakeLists.txt@1.8, 2007-07-31 19:34:32+02:00, joerg@trift2. +3 -6
    Restore the current 5.1 contents into the 5.0-dependent file.
    
    For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".

  mysys/CMakeLists.txt@1.7, 2007-07-31 19:03:44+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~14 -> mysys/CMakeLists.txt

  regex/CMakeLists.txt@1.5, 2007-07-31 19:34:32+02:00, joerg@trift2. +1 -1
    Restore the current 5.1 contents into the 5.0-dependent file.
    
    For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".

  regex/CMakeLists.txt@1.4, 2007-07-31 19:03:44+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~15 -> regex/CMakeLists.txt

  server-tools/instance-manager/CMakeLists.txt@1.6, 2007-07-31 19:34:32+02:00, joerg@trift2. +2 -1
    Restore the current 5.1 contents into the 5.0-dependent file.
    
    For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".

  server-tools/instance-manager/CMakeLists.txt@1.5, 2007-07-31 19:03:45+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~2 -> server-tools/instance-manager/CMakeLists.txt

  sql/CMakeLists.txt@1.12, 2007-07-31 19:34:32+02:00, joerg@trift2. +35 -30
    Restore the current 5.1 contents into the 5.0-dependent file.
    
    For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".

  sql/CMakeLists.txt@1.11, 2007-07-31 19:03:45+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~3 -> sql/CMakeLists.txt

  storage/heap/CMakeLists.txt@1.5, 2007-07-31 19:34:32+02:00, joerg@trift2. +8 -1
    Restore the current 5.1 contents into the 5.0-dependent file.
    
    For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".

  storage/heap/CMakeLists.txt@1.4, 2007-07-31 19:03:46+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~4ef559bc8b4695f7 -> storage/heap/CMakeLists.txt

  storage/innobase/CMakeLists.txt@1.9, 2007-07-31 19:34:32+02:00, joerg@trift2. +11 -44
    Restore the current 5.1 contents into the 5.0-dependent file.
    
    For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".

  storage/innobase/CMakeLists.txt@1.8, 2007-07-31 19:03:46+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d -> storage/innobase/CMakeLists.txt

  storage/myisam/CMakeLists.txt@1.6, 2007-07-31 19:34:32+02:00, joerg@trift2. +9 -1
    Restore the current 5.1 contents into the 5.0-dependent file.
    
    For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".

  storage/myisam/CMakeLists.txt@1.5, 2007-07-31 19:03:47+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740 -> storage/myisam/CMakeLists.txt

  storage/myisammrg/CMakeLists.txt@1.5, 2007-07-31 19:34:32+02:00, joerg@trift2. +8 -1
    Restore the current 5.1 contents into the 5.0-dependent file.
    
    For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".

  storage/myisammrg/CMakeLists.txt@1.4, 2007-07-31 19:03:47+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~84669765249a4bad -> storage/myisammrg/CMakeLists.txt

  strings/CMakeLists.txt@1.5, 2007-07-31 19:34:32+02:00, joerg@trift2. +1 -1
    Restore the current 5.1 contents into the 5.0-dependent file.
    
    For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".

  strings/CMakeLists.txt@1.4, 2007-07-31 19:03:48+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~4 -> strings/CMakeLists.txt

  tests/CMakeLists.txt@1.3.1.1, 2007-07-31 19:03:48+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~5 -> tests/CMakeLists.txt

  vio/CMakeLists.txt@1.4, 2007-07-31 19:03:49+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~6 -> vio/CMakeLists.txt

  zlib/CMakeLists.txt@1.4, 2007-07-31 19:03:50+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-CMakeLists.txt~8 -> zlib/CMakeLists.txt

ChangeSet@1.2536.11.24, 2007-07-31 20:52:43+04:00, kostja@bodhi.(none) +1 -0
  Post-merge fixes.

  sql/sql_base.cc@1.414.1.4, 2007-07-31 20:52:36+04:00, kostja@bodhi.(none) +2 -2
    Fix an incorrect manual merge.

ChangeSet@1.2536.33.11, 2007-07-31 18:04:05+03:00, gkodinov@magare.gmz +3 -0
  Addendum to bug 27417: poor test results fixes.

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.45, 2007-07-31 18:03:58+03:00, gkodinov@magare.gmz +0 -8
    Addendum to bug 27417: removed tests for another bug

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@1.13, 2007-07-31 18:03:58+03:00, gkodinov@magare.gmz +4 -2
    Addendum to bug 27417: removed tests for another bug

  mysql-test/suite/rpl/r/rpl_row_create_table.result@1.15.1.1, 2007-07-31 18:03:58+03:00, gkodinov@magare.gmz +8 -0
    Addendum to bug 27417: changes to non-transactional tables 
    should be logged even on rollback.

ChangeSet@1.1810.2871.46, 2007-07-31 19:40:36+05:00, svoj@mysql.com +1 -0
  BUG#29152 - INSERT DELAYED does not use concurrent_insert on slave
  
  INSERT DELAYED on a replication slave was converted to regular INSERT,
  whereas it should try concurrent INSERT first.
  
  With this patch we try to convert delayed insert to concurrent insert on
  a replication slave. If it is impossible for some reason, we fall back to
  regular insert.
  
  No test case for this fix. I do not see anything indicating this is
  regression - we behave this way since Nov 2000.

  sql/sql_insert.cc@1.146.64.1, 2007-07-31 19:40:32+05:00, svoj@mysql.com +8 -1
    If we're executing INSERT DELAYED on a replication slave, we're upgrading
    lock type to TL_WRITE as we need to ensure serial execution of queries on
    the slave.
    
    OTOH if we're executing regular INSERT on a replication slave, we're
    trying TL_WRITE_CONCURRENT_INSERT first, and if we may not use it, we
    fall back to TL_WRITE.
    
    Fixed INSERT DELAYED on a replication slave to behave the same way as
    regular INSERT, that is to try TL_WRITE_CONCURRENT_INSERT first.

ChangeSet@1.1810.3216.1, 2007-07-31 17:42:48+04:00, evgen@moonbone.local +1 -0
  ha_innodb.cc:
    Warning fixed.

  sql/ha_innodb.cc@1.202.49.2, 2007-07-31 17:41:06+04:00, evgen@moonbone.local +2 -1
    Warning fixed.

ChangeSet@1.1810.3206.9, 2007-07-31 16:15:56+04:00, sergefp@mysql.com +1 -0
  Post-merge fixes

  sql/sql_union.cc@1.130.1.14, 2007-07-31 16:15:52+04:00, sergefp@mysql.com +2 -2
    Post-merge fixes

ChangeSet@1.2536.33.9, 2007-07-31 14:58:04+03:00, gkodinov@magare.gmz +6 -0
  merge of the fix for bug 17417 5.0-opt->5.1-opt

  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@1.45, 2007-07-31 14:53:28+03:00, gkodinov@magare.gmz +0 -118
    merge of the fix for bug 17417 5.0-opt->5.1-opt

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.44, 2007-07-31 14:53:28+03:00, gkodinov@magare.gmz +12 -12
    merge of the fix for bug 17417 5.0-opt->5.1-opt

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@1.12, 2007-07-31 14:53:28+03:00, gkodinov@magare.gmz +120 -0
    merge of the fix for bug 17417 5.0-opt->5.1-opt

  sql/sql_class.cc@1.335.1.14, 2007-07-31 14:53:28+03:00, gkodinov@magare.gmz +1 -1
    merge of the fix for bug 17417 5.0-opt->5.1-opt

  sql/sql_insert.cc@1.287.1.3, 2007-07-31 14:53:28+03:00, gkodinov@magare.gmz +1 -1
    merge of the fix for bug 17417 5.0-opt->5.1-opt

  sql/sql_parse.cc@1.694.1.3, 2007-07-31 14:53:28+03:00, gkodinov@magare.gmz +1 -1
    merge of the fix for bug 17417 5.0-opt->5.1-opt

ChangeSet@1.1810.3212.2, 2007-07-31 14:42:56+03:00, gkodinov@magare.gmz +1 -0
  addendum for the fix for bug 27417:
  extend the assert so it will run the testsuite

  sql/sql_update.cc@1.154.2.68, 2007-07-31 14:42:53+03:00, gkodinov@magare.gmz +2 -1
    addendum for the fix for bug 27417:
    extend the assert so it will run the testsuite

ChangeSet@1.1810.3215.1, 2007-07-31 15:19:06+04:00, sergefp@mysql.com +3 -0
  BUG#29582: huge memory consumption with union, subselect, joins:
  - Don't call mysql_select() several times for the select that enumerates
    a temporary table with the results of the UNION. Making this call for
    every subquery execution caused O(#enumerated-rows-in-the-outer-query) 
    memory allocations.
  - Instead, call join->reinit() and join->exec(), and
    = disable constant table detection for such joins,  
    = provide special handling for table-less constant subqueries.

  sql/sql_select.cc@1.312.164.1, 2007-07-31 15:18:46+04:00, sergefp@mysql.com +1 -1
    BUG#29582: huge memory consumption with union, subselect, joins:
     - Don't mark tables as constant if JOIN::no_const_tables flag is set

  sql/sql_select.h@1.92.5.1, 2007-07-31 15:18:46+04:00, sergefp@mysql.com +10 -0
    BUG#29582: huge memory consumption with union, subselect, joins:
     - Don't mark tables as constant if JOIN::no_const_tables flag is set

  sql/sql_union.cc@1.130.1.13, 2007-07-31 15:18:46+04:00, sergefp@mysql.com +40 -17
    BUG#29582: huge memory consumption with union, subselect, joins:
    - Don't call mysql_select() several times for the select that enumerates
      a temporary table with UNION results. 
    - Instead, call join->reinit() and join->exec().
    - Provide special handling for table-less constant subqueries. 

ChangeSet@1.2536.35.3, 2007-07-31 13:22:01+05:00, gshchepa@gleb.loc +3 -0
  sql_yacc.yy, sp.result, disabled.def:
    Post-merge fix.

  mysql-test/r/sp.result@1.287, 2007-07-31 13:20:59+05:00, gshchepa@gleb.loc +4 -4
    Post-merge fix.

  mysql-test/t/disabled.def@1.278, 2007-07-31 13:20:23+05:00, gshchepa@gleb.loc +0 -1
    Post-merge fix.

  sql/sql_yacc.yy@1.593, 2007-07-31 13:21:34+05:00, gshchepa@gleb.loc +1 -1
    Post-merge fix.

ChangeSet@1.1810.3214.2, 2007-07-31 11:10:03+05:00, holyfoot@mysql.com +2 -0
  merging

  mysql-test/r/group_by.result@1.69.1.10, 2007-07-31 11:09:58+05:00, holyfoot@mysql.com +17 -0
    merging

  mysql-test/r/insert_select.result@1.35.1.15, 2007-07-31 11:09:58+05:00, holyfoot@mysql.com +26 -0
    merging

ChangeSet@1.1616.3084.1, 2007-07-31 10:46:04+05:00, holyfoot@mysql.com +6 -0
  Bug #29717 INSERT INTO SELECT inserts values even if
   SELECT statement itself returns empty.
  
  As a result of this bug 'SELECT AGGREGATE_FUNCTION(fld) ... GROUP BY'
  can return one row instead of an empty result set.
  
  When GROUP BY only has fields of constant tables
  (with a single row), the optimizer deletes the group_list.
  After that we lose the information about whether we had an
  GROUP BY statement. Though it's important
  as SELECT min(x) from empty_table; and
     SELECT min(x) from empty_table GROUP BY y; have to return
  different results - the first query should return one row,
  second - an empty result set.
  So here we add the 'group_optimized_away' flag to remember this case
  when GROUP BY exists in the query and is removed
  by the optimizer, and check this flag in end_send_group()

  mysql-test/r/group_by.result@1.38.1.16, 2007-07-31 10:45:59+05:00, holyfoot@mysql.com +17 -0
    Bug #29717 INSERT INTO SELECT inserts values even if
     SELECT statement itself returns empty.
    
    test result

  mysql-test/r/insert_select.result@1.16.1.15, 2007-07-31 10:45:59+05:00, holyfoot@mysql.com +26 -0
    Bug #29717 INSERT INTO SELECT inserts values even if
     SELECT statement itself returns empty.
    
    test result

  mysql-test/t/group_by.test@1.36.1.9, 2007-07-31 10:45:59+05:00, holyfoot@mysql.com +23 -0
    Bug #29717 INSERT INTO SELECT inserts values even if
     SELECT statement itself returns empty.
    
    This is additional testcase that is more basic than the
    original bug's testcase and has the same reason.

  mysql-test/t/insert_select.test@1.14.1.11, 2007-07-31 10:45:59+05:00, holyfoot@mysql.com +28 -0
    Bug #29717 INSERT INTO SELECT inserts values even if
     SELECT statement itself returns empty.
    
    test case

  sql/sql_select.cc@1.216.149.1, 2007-07-31 10:45:59+05:00, holyfoot@mysql.com +3 -1
    Bug #29717 INSERT INTO SELECT inserts values even if
     SELECT statement itself returns empty.
    
    Remember the 'GROUP BY was optimized away' case in the JOIN::group_optimized
    and check this in the end_send_group()

  sql/sql_select.h@1.60.1.22, 2007-07-31 10:45:59+05:00, holyfoot@mysql.com +9 -0
    Bug #29717 INSERT INTO SELECT inserts values even if
     SELECT statement itself returns empty.
    
    JOIN::group_optimized member added to remember the 'GROUP BY optimied away'
    case

ChangeSet@1.2536.37.1, 2007-07-30 23:01:44-06:00, malff@weblab.(none) +1 -0
  Fixed ressource leak when activation of LOGGER failed.

  sql/log.cc@1.282.6.1, 2007-07-30 23:01:25-06:00, malff@weblab.(none) +15 -6
    Fixed ressource leak when activation of LOGGER failed.

ChangeSet@1.2547, 2007-07-30 17:39:54-04:00, cbell@mysql_cab_desk. +3 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  Minor refactoring to remove compile warnings and possibly fix the
  Solaris test failures.

  sql/log_event.cc@1.294, 2007-07-30 17:39:48-04:00, cbell@mysql_cab_desk. +4 -4
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    Minor refactoring.

  sql/rpl_utility.cc@1.11, 2007-07-30 17:39:49-04:00, cbell@mysql_cab_desk. +1 -2
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    Minor refactoring.

  sql/rpl_utility.h@1.9, 2007-07-30 17:39:49-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    Minor refactoring.

ChangeSet@1.2536.12.9, 2007-07-30 13:35:36-06:00, tsmith@ramayana.hindu.god +1 -0
  mysqld_safe.sh:
    Post-review fix, if 'logger' can't be found, and --syslog is requested, exit with error message instead of fall back to logging to error file.

  scripts/mysqld_safe.sh@1.92, 2007-07-30 13:35:27-06:00, tsmith@ramayana.hindu.god +2 -2
    Post-review fix, if 'logger' can't be found, and --syslog is requested, exit with error message instead of fall back to logging to error file.

ChangeSet@1.1810.3201.3, 2007-07-30 21:09:45+02:00, kent@mysql.com +5 -0
  Generate "config.h" directly into the "include" directory, later copied
  to "my_config.h". Not to pollute the top directory, and to get more control
  over what is included. Made the include path for "libedit" pick up its own
  "config.h" first.

  cmd-line-utils/libedit/Makefile.am@1.16, 2007-07-30 20:55:49+02:00, kent@mysql.com +2 -2
    Changed include path so that current directory is taken first, as there
    is a "config.h" there with the same name as the one in top "include".

  config/ac-macros/misc.m4@1.12.1.2, 2007-07-30 15:02:15+02:00, kent@mysql.com +0 -1
    aclocal in automake 1.8 can't handle AC_REQUIRE on
    a user macro defined in the same included file.

  configure.in@1.245.1.209, 2007-07-30 20:55:49+02:00, kent@mysql.com +1 -1
    Generate "config.h" directly into "include", don't pollute top directory

  include/Makefile.am@1.52.2.17, 2007-07-30 20:55:49+02:00, kent@mysql.com +5 -2
    Copy "config.h" from current directory to "my_config.h", added note in
    the make file why there are two identical files with different name.

  scripts/make_binary_distribution.sh@1.101.1.29, 2007-07-30 20:55:49+02:00, kent@mysql.com +1 -1
    Removed copy of "config.h" from top directory, it is in "include" in a
    source tree.

ChangeSet@1.1616.3080.6, 2007-07-30 20:40:49+02:00, kent@mysql.com +1 -0
  my_pthread.c:
    Backport of correction for Mac OS X build problem, global variable not
    initiated is "common" and can't be used in shared libraries, unless
    special flags are used (bug#26218)

  mysys/my_pthread.c@1.37.1.11, 2007-07-30 20:38:48+02:00, kent@mysql.com +1 -1
    Backport of correction for Mac OS X build problem, global variable not
    initiated is "common" and can't be used in shared libraries, unless
    special flags are used (bug#26218)

ChangeSet@1.2536.36.1, 2007-07-30 19:56:02+02:00, serg@janus.mylan +4 -0
  handler::ha_write_row_no_binlog() hack removed,
  existing table->no_replicate code is used instead

  sql/handler.cc@1.316.1.3, 2007-07-30 19:55:51+02:00, serg@janus.mylan +0 -13
    handler::ha_write_row_no_binlog() hack removed,
    existing table->no_replicate code is used instead

  sql/handler.h@1.270, 2007-07-30 19:55:51+02:00, serg@janus.mylan +0 -1
    handler::ha_write_row_no_binlog() hack removed,
    existing table->no_replicate code is used instead

  sql/log.cc@1.282.1.20, 2007-07-30 19:55:51+02:00, serg@janus.mylan +2 -2
    handler::ha_write_row_no_binlog() hack removed,
    existing table->no_replicate code is used instead

  sql/sql_base.cc@1.414.1.2, 2007-07-30 19:55:51+02:00, serg@janus.mylan +1 -0
    handler::ha_write_row_no_binlog() hack removed,
    existing table->no_replicate code is used instead

ChangeSet@1.2546, 2007-07-30 12:55:26-04:00, cbell@mysql_cab_desk. +4 -0
  WL#3915 : (NDB) master's cols > slave
  
  Corrective patch to fix test failures in pushbuild and add assertions
  to help debug rpl_extraColmaster test failures.

  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test@1.10, 2007-07-30 12:55:15-04:00, cbell@mysql_cab_desk. +6 -6
    WL#3915 : (NDB) master's cols > slave
    
    Change test to omit the port numbers in the result file.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.22, 2007-07-30 12:55:16-04:00, cbell@mysql_cab_desk. +6 -6
    WL#3915 : (NDB) master's cols > slave
    
    Corrected result file.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.19, 2007-07-30 12:55:17-04:00, cbell@mysql_cab_desk. +6 -6
    WL#3915 : (NDB) master's cols > slave
    
    Corrected result file.

  sql/rpl_utility.cc@1.10, 2007-07-30 12:55:17-04:00, cbell@mysql_cab_desk. +9 -0
    WL#3915 : (NDB) master's cols > slave
    
    Added assertions to assist in debugging.

ChangeSet@1.1810.3213.1, 2007-07-30 21:05:56+05:00, gshchepa@gleb.loc +1 -0
  bigint.test:
    Fixing a typo in the test case.

  mysql-test/t/bigint.test@1.29.1.4, 2007-07-30 21:04:53+05:00, gshchepa@gleb.loc +1 -1
    Fixing a typo in the test case.

ChangeSet@1.2545, 2007-07-30 11:59:05-04:00, cbell@mysql_cab_desk. +4 -0
  WL#3915 : (NDB) master's cols > slave
  
  Changed test to enable easier debugging. 

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.2, 2007-07-30 11:58:49-04:00, cbell@mysql_cab_desk. +113 -0
    WL#3915 : (NDB) master's cols > slave
    
    Changes to test in order to aide debugging.

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.2, 2007-07-30 11:58:50-04:00, cbell@mysql_cab_desk. +819 -518
    WL#3915 : (NDB) master's cols > slave
    
    New result file for test changes.

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.2, 2007-07-30 11:58:51-04:00, cbell@mysql_cab_desk. +819 -518
    WL#3915 : (NDB) master's cols > slave
    
    New result file for test changes.

  mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result@1.2, 2007-07-30 11:58:51-04:00, cbell@mysql_cab_desk. +418 -267
    WL#3915 : (NDB) master's cols > slave
    
    New result file for test changes.

ChangeSet@1.1810.3212.1, 2007-07-30 18:27:36+03:00, gkodinov@magare.gmz +16 -0
  (pushing for Andrei)
  Bug #27417 thd->no_trans_update.stmt lost value inside of SF-exec-stack
    
  Once had been set the flag might later got reset inside of a stored routine 
  execution stack.
  The reason was in that there was no check if a new statement started at time 
  of resetting.
  The artifact affects most of binlogable DML queries. Notice, that multi-update 
  is wrapped up within
    bug@27716 fix, multi-delete bug@29136.
    
  Fixed with saving parent's statement flag of whether the statement modified 
  non-transactional table, and unioning (merging) the value with that was gained 
  in mysql_execute_command.
    
  Resettling thd->no_trans_update members into thd->transaction.`member`;
  Asserting code;
  Effectively the following properties are held.
    
  1. At the end of a substatement thd->transaction.stmt.modified_non_trans_table
     reflects the fact if such a table got modified by the substatement.
     That also respects THD::really_abort_on_warnin() requirements.
  2. Eventually thd->transaction.stmt.modified_non_trans_table will be computed as
     the union of the values of all invoked sub-statements.
     That fixes this bug#27417;
  
  Computing of thd->transaction.all.modified_non_trans_table is refined to base to 
  the stmt's value for all the case including insert .. select statement which 
  before the patch had an extra issue bug@28960.
  Minor issues are covered with mysql_load, mysql_delete, and binloggin of insert in
  to temp_table select. 
    
  The supplied test verifies limitely, mostly asserts. The ultimate testing is defered
  for bug@13270, bug@23333.

  mysql-test/t/mix_innodb_myisam_binlog.test@1.20.13.1, 2007-07-30 18:27:30+03:00, gkodinov@magare.gmz +120 -2
    regression test incl the related bug#28960.

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.10.1, 2007-07-30 18:27:30+03:00, gkodinov@magare.gmz +113 -0
    results changed

  sql/ha_ndbcluster.cc@1.175.1.139, 2007-07-30 18:27:30+03:00, gkodinov@magare.gmz +1 -1
    thd->transaction.{all,stmt}.modified_non_trans_table
    instead of
    thd->no_trans_update.{all,stmt}

  sql/handler.cc@1.167.36.1, 2007-07-30 18:27:30+03:00, gkodinov@magare.gmz +1 -1
    thd->transaction.{all,stmt}.modified_non_trans_table
    instead of
    thd->no_trans_update.{all,stmt}

  sql/handler.h@1.138.19.1, 2007-07-30 18:27:30+03:00, gkodinov@magare.gmz +29 -0
    new member added

  sql/log.cc@1.158.1.62, 2007-07-30 18:27:30+03:00, gkodinov@magare.gmz +2 -2
    thd->transaction.{all,stmt}.modified_non_trans_table
    instead of
    thd->no_trans_update.{all,stmt}

  sql/set_var.cc@1.125.5.47, 2007-07-30 18:27:30+03:00, gkodinov@magare.gmz +2 -2
    thd->transaction.{all,stmt}.modified_non_trans_table
    instead of
    thd->no_trans_update.{all,stmt}

  sql/sp_head.cc@1.200.21.1, 2007-07-30 18:27:30+03:00, gkodinov@magare.gmz +15 -5
    thd->transaction.{all,stmt}.modified_non_trans_table
    instead of
    thd->no_trans_update.{all,stmt}
    
    and saving and merging stmt's flag at the end of a substatement.

  sql/sql_class.cc@1.223.32.1, 2007-07-30 18:27:30+03:00, gkodinov@magare.gmz +1 -1
    thd->transaction.{all,stmt}.modified_non_trans_table
    instead of
    thd->no_trans_update.{all,stmt}

  sql/sql_class.h@1.230.77.1, 2007-07-30 18:27:30+03:00, gkodinov@magare.gmz +1 -5
    thd->transaction.{all,stmt}.modified_non_trans_table
    instead of
    thd->no_trans_update.{all,stmt}

  sql/sql_delete.cc@1.144.1.55, 2007-07-30 18:27:30+03:00, gkodinov@magare.gmz +21 -10
    correcting basic delete incl truncate branch and multi-delete queries to set
    stmt.modified_non_trans_table;
    optimization to set the flag at the end of per-row loop;
    multi-delete still has an extra issue similar to bug#27716 of multi-update 
    - to be address with bug_29136 fix.

  sql/sql_insert.cc@1.146.1.102, 2007-07-30 18:27:30+03:00, gkodinov@magare.gmz +24 -19
    thd->transaction.{all,stmt}.modified_non_trans_table
    instead of
    thd->no_trans_update.{all,stmt}

  sql/sql_load.cc@1.78.1.38, 2007-07-30 18:27:30+03:00, gkodinov@magare.gmz +6 -10
    eliminating a separate issue where the stmt flag was saved and re-stored after 
    write_record that actually could change it and the change would be lost but 
    should remain permanent;
    thd->transaction.{all,stmt}.modified_non_trans_table
    instead of
    thd->no_trans_update.{all,stmt}

  sql/sql_parse.cc@1.426.1.207, 2007-07-30 18:27:30+03:00, gkodinov@magare.gmz +12 -10
    initialization to transaction.stmt.modified_non_trans_table at the common part 
    of all types of statements processing - mysql_execute_command().

  sql/sql_table.cc@1.239.1.114, 2007-07-30 18:27:30+03:00, gkodinov@magare.gmz +0 -1
    moving the reset up to the mysql_execute_command() caller

  sql/sql_update.cc@1.154.2.67, 2007-07-30 18:27:30+03:00, gkodinov@magare.gmz +20 -21
    correcting update query case (multi-update part of the issues covered by other 
    bug#27716 fix)
    thd->transaction.{all,stmt}.modified_non_trans_table
    instead of
    thd->no_trans_update.{all,stmt}

ChangeSet@1.2536.11.20, 2007-07-30 19:23:53+04:00, anozdrin@ibm. +1 -0
  Disable IM tests.

  mysql-test/t/disabled.def@1.274.2.2, 2007-07-30 19:23:41+04:00, anozdrin@ibm. +8 -11
    Disable IM tests.

ChangeSet@1.2544, 2007-07-30 10:22:42-04:00, cbell@mysql_cab_desk. +2 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  This patch includes changes to result files for tests issuing BINLOG
  queries. The values have changed due to a size difference in the
  table map.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.21, 2007-07-30 10:22:36-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    New results file for changes to binlog table map log event size.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.18, 2007-07-30 10:22:36-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    New results file for changes to binlog table map log event size.

ChangeSet@1.1810.3211.1, 2007-07-30 17:14:34+04:00, evgen@moonbone.local +8 -0
  Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
  
  When innodb detects a deadlock it calls ha_rollback_trans() to rollback the 
  main transaction. But such action isn't allowed from inside of triggers and
  functions. When it happen the 'Explicit or implicit commit' error is thrown
  even if there is no commit/rollback statements in the trigger/function. This
  leads to the user confusion.
  
  Now the convert_error_code_to_mysql() function doesn't call the 
  ha_rollback_trans() function directly but rather calls the
  mark_transaction_to_rollback function and returns an error.
  The sp_rcontext::find_handler() now doesn't allow errors to be caught by the
  trigger/function error handlers when the thd->is_fatal_sub_stmt_error flag
  is set. Procedures are still allowed to catch such errors.
  The sp_rcontext::find_handler function now accepts a THD handle as a parameter.
  The transaction_rollback_request and the is_fatal_sub_stmt_error flags are 
  added to the THD class. The are initialized by the THD class constructor.
  Now the ha_autocommit_or_rollback function rolls back main transaction
  when not in a sub statement and the thd->transaction_rollback_request
  is set.
  The THD::restore_sub_statement_state function now resets the 
  thd->is_fatal_sub_stmt_error flag on exit from a sub-statement.

  mysql-test/t/innodb-big.test@1.1.1.1, 2007-07-30 17:00:01+04:00, evgen@moonbone.local +106 -0
    Added a test case for the bug#24989: The DEADLOCK error is improperly handled by
    InnoDB.

  mysql-test/r/innodb-big.result@1.2.1.1, 2007-07-30 16:59:58+04:00, evgen@moonbone.local +66 -0
    Added a test case for the bug#24989: The DEADLOCK error is improperly handled by
    InnoDB.

  sql/handler.cc@1.167.35.1, 2007-07-30 16:46:12+04:00, evgen@moonbone.local +5 -0
    Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
    Now the ha_autocommit_or_rollback function rolls back main transaction
    when not in a sub statement and the thd->transaction_rollback_request
    is set.

  sql/sp_rcontext.cc@1.44.1.1, 2007-07-30 17:13:55+04:00, evgen@moonbone.local +15 -3
    Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
    The sp_rcontext::find_handler() now doesn't allow errors to be caught by the
    trigger/function error handlers when the thd->is_fatal_sub_stmt_error flag
    is set. Instead it tries to find a most inner procedure that isn't called
    directly or indirectly from any function/trigger.
    Procedures are still allowed to catch such errors.
    The sp_rcontext::find_handler function now accepts a THD handle as a parameter.

  sql/sp_rcontext.h@1.35, 2007-07-30 17:07:50+04:00, evgen@moonbone.local +5 -1
    Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
    The sp_rcontext::find_handler function now accepts a THD handle as a parameter.
    The in_sub_stmt flag is added to the sp_rcontext class.

  sql/sql_class.cc@1.223.31.1, 2007-07-30 17:06:36+04:00, evgen@moonbone.local +21 -1
    Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
    Initialization of the transaction_rollback_request and the
    is_fatal_sub_stmt_error flags are added to the THD class constructor.
    The mark_transaction_to_rollback function is added.
    The THD::restore_sub_statement_state function now resets the
    thd->is_fatal_sub_stmt_error flag on exit from a sub-statement.

  sql/sql_class.h@1.230.75.1, 2007-07-30 17:05:18+04:00, evgen@moonbone.local +29 -1
    Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
    The transaction_rollback_request and the is_fatal_sub_stmt_error flags are 
    added to the THD class.

  sql/ha_innodb.cc@1.202.48.1, 2007-07-30 16:45:50+04:00, evgen@moonbone.local +3 -9
    Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
    Now the convert_error_code_to_mysql() function doesn't call the
    ha_rollback_trans() function directly but rather calls the
    mark_transaction_to_rollback function and returns an error.

ChangeSet@1.1810.3210.1, 2007-07-30 16:03:52+03:00, gkodinov@magare.gmz +1 -0
  Moved the DBUG_ASSERT from bug 28983 to
  a place where it would not obstruct
  correct multithreading.

  sql/log.cc@1.158.1.61, 2007-07-30 16:03:43+03:00, gkodinov@magare.gmz +1 -0
    Moved the DBUG_ASSERT from bug 28983 to
    a place where it would not obstruct
    correct multithreading.

ChangeSet@1.2543, 2007-07-30 13:32:15+02:00, mats@kindahl-laptop.dnsalias.net +8 -0
  WL#3228 (RBR using different table defs on slave/master):
  
  Fixing tests and results to work when replicating to fewer columns on
  slave than on master. One test that previously should fail, now works,
  and some log positions have changed as a result of adding metadata to
  the events.

  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test@1.9, 2007-07-30 13:32:03+02:00, mats@kindahl-laptop.dnsalias.net +9 -5
    Replication to fewer columns on slave now works.

  mysql-test/include/wait_for_slave_to_stop.inc@1.3, 2007-07-30 13:32:03+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
    Adding subsitutions for SHOW SLAVE STATUS

  mysql-test/suite/binlog/r/binlog_row_binlog.result@1.21, 2007-07-30 13:32:03+02:00, mats@kindahl-laptop.dnsalias.net +805 -805
    Result change.

  mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result@1.12, 2007-07-30 13:32:03+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.20, 2007-07-30 13:32:03+02:00, mats@kindahl-laptop.dnsalias.net +240 -9
    Result change.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.17, 2007-07-30 13:32:04+02:00, mats@kindahl-laptop.dnsalias.net +240 -9
    Result change.

  mysql-test/suite/rpl/r/rpl_slave_skip.result@1.5, 2007-07-30 13:32:04+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change.

  mysql-test/suite/rpl/t/rpl_skip_error-slave.opt@1.8, 2007-07-30 13:32:04+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Error number changed [!]

ChangeSet@1.1810.3189.8, 2007-07-30 14:22:29+04:00, kostja@bodhi.(none) +1 -0
  Fix a compilation warning.

  sql/handler.h@1.138.2.50, 2007-07-30 14:22:23+04:00, kostja@bodhi.(none) +0 -1
    Fix a warning.

ChangeSet@1.2536.11.19, 2007-07-30 14:03:47+04:00, anozdrin@ibm. +2 -0
  Fix merge: update result files.

  mysql-test/r/ddl_i18n_koi8r.result@1.2, 2007-07-30 14:03:35+04:00, anozdrin@ibm. +12 -0
    Update result file.

  mysql-test/r/ddl_i18n_utf8.result@1.2, 2007-07-30 14:03:35+04:00, anozdrin@ibm. +12 -0
    Update result file.

ChangeSet@1.2536.9.4, 2007-07-30 11:33:50+03:00, monty@mysql.com +56 -0
  Slow query log to file now displays queries with microsecond precission
  --long-query-time is now given in seconds with microseconds as decimals
  --min_examined_row_limit added for slow query log
  long_query_time user variable is now double with 6 decimals
  Added functions to get time in microseconds
  Added faster time() functions for system that has gethrtime()  (Solaris)
  We now do less time() calls.
  Added field->in_read_set() and field->in_write_set() for easier field manipulation by handlers
  set_var.cc and my_getopt() can now handle DOUBLE variables.
  All time() calls changed to my_time()
  my_time() now does retry's if time() call fails.
  Added debug function for stopping in mysql_admin_table() when tables are locked
  Some trivial function and struct variable renames to avoid merge errors.
  Fixed compiler warnings
  Initialization of some time variables on windows moved to my_init() 

  libmysql/CMakeLists.txt@1.14, 2007-07-30 11:33:41+03:00, monty@mysql.com +1 -1
    Added new time functions

  include/my_getopt.h@1.23, 2007-07-30 11:33:41+03:00, monty@mysql.com +1 -0
    Added support for double arguments

  include/my_sys.h@1.225, 2007-07-30 11:33:41+03:00, monty@mysql.com +5 -1
    Fixed wrong type to packfrm()
    Added new my_time functions

  include/mysql/plugin.h@1.38, 2007-07-30 11:33:41+03:00, monty@mysql.com +1 -1
    Added support for DOUBLE

  libmysql/Makefile.shared@1.72, 2007-07-30 11:33:41+03:00, monty@mysql.com +1 -1
    Added new time functions

  mysql-test/r/variables.result@1.100, 2007-07-30 11:33:41+03:00, monty@mysql.com +8 -1
    Testing of long_query_time

  mysql-test/t/variables.test@1.72, 2007-07-30 11:33:41+03:00, monty@mysql.com +4 -1
    Testing of long_query_time

  mysys/charset.c@1.156, 2007-07-30 11:33:41+03:00, monty@mysql.com +4 -4
    Fixed compiler warnings

  mysys/default_modify.c@1.15, 2007-07-30 11:33:41+03:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  mysys/hash.c@1.59, 2007-07-30 11:33:41+03:00, monty@mysql.com +12 -8
    Fixed compiler warnings

  mysys/mf_getdate.c@1.10, 2007-07-30 11:33:42+03:00, monty@mysql.com +1 -1
    Use my_time()

  mysys/mf_iocache2.c@1.35, 2007-07-30 11:33:42+03:00, monty@mysql.com +7 -7
    Fixed compiler warnings

  mysys/mf_pack.c@1.25, 2007-07-30 11:33:42+03:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  mysys/mf_path.c@1.14, 2007-07-30 11:33:42+03:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  mysys/my_append.c@1.9, 2007-07-30 11:33:42+03:00, monty@mysql.com +8 -7
    Fixed compiler warnings

  mysys/my_compress.c@1.19, 2007-07-30 11:33:42+03:00, monty@mysql.com +8 -5
    Fixed compiler warnings

  mysys/my_copy.c@1.20, 2007-07-30 11:33:42+03:00, monty@mysql.com +4 -2
    Fixed compiler warnings

  mysys/my_gethwaddr.c@1.6, 2007-07-30 11:33:42+03:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  mysys/my_getopt.c@1.73, 2007-07-30 11:33:42+03:00, monty@mysql.com +42 -1
    Added support for double arguments

  mysys/my_getsystime.c@1.8, 2007-07-30 11:33:42+03:00, monty@mysql.com +168 -18
    Added functions to get time in microseconds.
    Added faster time() functions for system that has gethrtime()  (Solaris)
    Moved windows initialization code to my_init()

  mysys/my_init.c@1.59, 2007-07-30 11:33:42+03:00, monty@mysql.com +22 -0
    Added initializing of variables needed for windows time functions

  mysys/my_static.c@1.23, 2007-07-30 11:33:42+03:00, monty@mysql.com +5 -0
    Added variables needed for windows time functions

  mysys/my_static.h@1.22, 2007-07-30 11:33:43+03:00, monty@mysql.com +2 -0
    Added variables needed for windows time functions

  mysys/my_thr_init.c@1.57, 2007-07-30 11:33:43+03:00, monty@mysql.com +3 -1
    Added THR_LOCK_time, used for faster my_time()

  mysys/mysys_priv.h@1.15, 2007-07-30 11:33:43+03:00, monty@mysql.com +1 -1
    Added THR_LOCK_time, used for faster my_time()

  mysys/thr_alarm.c@1.64, 2007-07-30 11:33:43+03:00, monty@mysql.com +6 -6
    time() -> my_time()

  sql-common/client.c@1.139.1.1, 2007-07-30 11:33:45+03:00, monty@mysql.com +2 -2
    time() -> my_time()

  sql/event_data_objects.cc@1.107.1.1, 2007-07-30 11:33:43+03:00, monty@mysql.com +1 -1
    end_time() -> set_current_time()

  sql/event_queue.cc@1.36.1.1, 2007-07-30 11:33:43+03:00, monty@mysql.com +1 -1
    end_time() -> set_current_time()

  sql/event_scheduler.cc@1.46, 2007-07-30 11:33:43+03:00, monty@mysql.com +1 -2
    Fixed compiler warnings

  sql/field.h@1.238.2.1, 2007-07-30 11:33:43+03:00, monty@mysql.com +2 -0
    Added field->in_read_set() and field->in_write_set() for easier field manipulation by handlers

  sql/item.h@1.253.1.1, 2007-07-30 11:33:43+03:00, monty@mysql.com +5 -2
    Added decimal to Item_float(double)

  sql/item_cmpfunc.h@1.162, 2007-07-30 11:33:43+03:00, monty@mysql.com +3 -2
    Added decimal to Item_float(double)

  sql/item_timefunc.cc@1.170, 2007-07-30 11:33:43+03:00, monty@mysql.com +1 -1
    time() -> my_time()

  sql/item_xmlfunc.cc@1.31, 2007-07-30 11:33:43+03:00, monty@mysql.com +1 -1
    Fixed compiler warning

  sql/lock.cc@1.111.2.1, 2007-07-30 11:33:43+03:00, monty@mysql.com +1 -1
    lock_time() -> set_time_after_lock()

  sql/log.cc@1.286, 2007-07-30 11:33:43+03:00, monty@mysql.com +53 -46
    Timing in slow query log to file is now done in microseconds
    Changed some while() loops to for() loops.
    Fixed indentation
    time() -> my_time()

  sql/log.h@1.26.1.1, 2007-07-30 11:33:43+03:00, monty@mysql.com +8 -8
    Slow query logging is now done based on microseconds

  sql/log_event.cc@1.291.1.1, 2007-07-30 11:33:44+03:00, monty@mysql.com +4 -4
    time() -> my_time()
    Fixed arguments to new Item_float()

  sql/mysql_priv.h@1.531.2.1, 2007-07-30 11:33:44+03:00, monty@mysql.com +3 -2
    Fixed compiler warnings
    Added opt_log_slow_slave_statements

  sql/mysqld.cc@1.660.1.1, 2007-07-30 11:33:44+03:00, monty@mysql.com +40 -19
    Added --log_slow_slave_statements and --min_examined_row_limit
    --long-query-time now takes a double argument with microsecond resolution
    Don't write shutdown message when using --help
    Removed not needed \n
    Thread create time and connect time is now done in microseconds
    time() -> my_time()
    Avoid some time() calls

  sql/net_serv.cc@1.114, 2007-07-30 11:33:44+03:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  sql/parse_file.cc@1.30, 2007-07-30 11:33:44+03:00, monty@mysql.com +1 -1
    time() -> my_time()

  sql/set_var.cc@1.243.2.1, 2007-07-30 11:33:44+03:00, monty@mysql.com +67 -2
    Added support for DOUBLE variables
    Added support for variables that are given in seconds with microsecond resolution

  sql/set_var.h@1.109, 2007-07-30 11:33:44+03:00, monty@mysql.com +25 -3
    Added support for variables that are given in seconds with microsecond resolution

  sql/slave.cc@1.313, 2007-07-30 11:33:44+03:00, monty@mysql.com +4 -3
    Allow logging of slave queries to slow query log if 'opt_log_slow_slave_statements' is given
    time() -> my_time()

  sql/sql_cache.h@1.41, 2007-07-30 11:33:44+03:00, monty@mysql.com +1 -0
    Fixed compiler warning()

  sql/sql_class.cc@1.340, 2007-07-30 11:33:44+03:00, monty@mysql.com +2 -1
    Initialize new THD variables

  sql/sql_class.h@1.384.1.1, 2007-07-30 11:33:44+03:00, monty@mysql.com +33 -30
    long_query_time is now in microseconds
    Added min_examined_row_limit
    Reordered some THD elements for higher efficency
    Added timers in microseconds (connect_utime, thr_create_utime, start_utime and utime_after_lock)
    Start of query is now recorded both in seconds and in microseconds.
    Following renames was made for more clarity and avoid merge problems from earlier versions:
    connect_time -> connect_utime
    thr_create_time -> thr_create_utime
    end_time()  -> set_current_time()
    lock_time() -> set_time_after_lock()
    
    Added THD::start_utime, which is start of query in microseconds from some arbitary time
    Added function THD::current_utime()
    
    Removed safe_time() as retry's are handled in my_time()

  sql/sql_connect.cc@1.8, 2007-07-30 11:33:44+03:00, monty@mysql.com +7 -7
    User resources are now using microsecond resolution

  sql/sql_insert.cc@1.286.1.1, 2007-07-30 11:33:44+03:00, monty@mysql.com +1 -1
    end_time() -> set_current_time()

  sql/sql_parse.cc@1.693.3.1, 2007-07-30 11:33:45+03:00, monty@mysql.com +9 -11
    Testing if we should print to slow_query_log() is now done with microsecond precission.
    If min_examined_row_limit is given, only log queries to slow query log that has examined more rows than this.

  sql/sql_select.cc@1.546, 2007-07-30 11:33:45+03:00, monty@mysql.com +2 -6
    Simplify code now that Item_float() takes decimals as argument

  sql/sql_show.cc@1.424.2.1, 2007-07-30 11:33:45+03:00, monty@mysql.com +6 -9
    time() -> my_time()
    Added support for SYS_DOUBLE

  sql/sql_table.cc@1.440.3.1, 2007-07-30 11:33:45+03:00, monty@mysql.com +15 -0
    Added debug function for stopping in mysql_admin_table() when tables are locked

  sql/structs.h@1.72, 2007-07-30 11:33:45+03:00, monty@mysql.com +5 -5
    intime -> reset_utime

ChangeSet@1.2536.9.3, 2007-07-30 06:22:25+03:00, monty@mysql.com +3 -0
  Add 'extension' field to all client library structures to make them extensible
  Reorder structure elements to make structures smaller and faster on 64 bit systems
  This is a first step in cleaning up the client include files (but should be enough to allow us to do future fixes without breaking the library)
  This change is part of WL#2872,  Make client library extensible.

  configure.in@1.475.1.1, 2007-07-30 06:22:15+03:00, monty@mysql.com +4 -3
    Increased shared library version of client library
    Detect gethrtime (for future)

  include/mysql.h@1.181, 2007-07-30 06:22:15+03:00, monty@mysql.com +32 -23
    Add 'extension' field to all structures to make them extensible
    Reorder structure elements to make structures smaller and faster on 64 bit systems
    Removed an old define that is not needed for MySQL 5.1

  include/mysql_com.h@1.123, 2007-07-30 06:22:15+03:00, monty@mysql.com +15 -12
    Add 'extension' field to all structures to make them extensible
    Reorder structure elements to make structures smaller and faster on 64 bit systems

ChangeSet@1.1810.3206.5, 2007-07-30 04:35:16+05:00, gshchepa@gleb.loc +6 -0
  Fixed bug #30120.
  SP with local variables with non-ASCII names crashed the server.
  
  The server replaces SP local variable names with NAME_CONST calls
  when putting statements into the binary log. It used UTF8-encoded
  item names as variable names for the replacement inside NAME_CONST
  calls. However, statement string may be encoded by any
  known character set by the SET NAMES statement.
  The server used byte length of UTF8-encoded names to increment
  the position in the query string that led to array index overrun.

  mysql-test/r/sp.result@1.170.28.23, 2007-07-30 04:33:31+05:00, gshchepa@gleb.loc +11 -0
    Updated test case for bug #30120.

  mysql-test/t/sp.test@1.174.28.21, 2007-07-30 04:33:10+05:00, gshchepa@gleb.loc +21 -0
    Updated test case for bug #30120.

  sql/item.cc@1.113.1.165, 2007-07-30 04:32:48+05:00, gshchepa@gleb.loc +2 -2
    Fixed bug #30120.
    The Item_splocal class constructor has been modified to
    accept new parameter `len_in_q': the byte length of
    variable name in the query string.

  sql/item.h@1.183.1.55, 2007-07-30 04:33:00+05:00, gshchepa@gleb.loc +10 -1
    Fixed bug #30120.
    The Item_splocal class has been modified to keep new
    field `len_in_query': the byte length of variable name in
    the query string.

  sql/sp_head.cc@1.200.7.28, 2007-07-30 04:33:05+05:00, gshchepa@gleb.loc +1 -1
    Fixed bug #30120.
    The subst_spvars function has been modified to increment
    position in the query string by the lengths of not
    encoded variable names instead of byte length of names
    encoded to UTF-8.

  sql/sql_yacc.yy@1.371.120.1, 2007-07-30 04:33:07+05:00, gshchepa@gleb.loc +2 -1
    Fixed bug #30120.
    The simple_ident rule action has been modified to
    pass the byte length of the local variable name token
    to the Item_splocal object constructor.

ChangeSet@1.2536.33.6, 2007-07-30 03:20:45+05:00, gshchepa@gleb.loc +1 -0
  disabled.def:
    ddl_i18n_koi8r.test has been disabled to ignore bug #30120.

  mysql-test/t/disabled.def@1.277, 2007-07-30 03:19:52+05:00, gshchepa@gleb.loc +1 -0
    ddl_i18n_koi8r.test has been disabled to ignore bug #30120.

ChangeSet@1.2542, 2007-07-29 18:10:42-04:00, cbell@mysql_cab_desk. +37 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  This patch adds the ability to store extra field metadata in the table
  map event. This data can include pack_length() or field_lenght() for
  fields such as CHAR or VARCHAR enabling developers to add code that
  can check for compatibilty between master and slave columns. More 
  importantly, the extra field metadata can be used to store data from the
  master correctly should a VARCHAR field on the master be <= 255 bytes 
  while the same field on the slave is > 255 bytes. 
  
  The patch also includes the needed changes to unpack to ensure that data
  which is smaller on the master can be unpacked correctly on the slave.
  
  WL#3915 : (NDB) master's cols > slave
  
  Slave starts accepting and handling rows of master's tables which have more columns.
  The most important part of implementation is how to caclulate the amount of bytes to
  skip for unknown by slave column.

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.1, 2007-07-29 18:10:32-04:00, cbell@mysql_cab_desk. +393 -0
    WL#3915  master's cols > slave
    
    basic tests checking altering and skipping extra fields by slave.
    The fields can be of any possible types.
    

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.0, 2007-07-29 18:10:32-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test@1.13, 2007-07-29 18:10:14-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to coincide with changes to binlog
    size of table map event.

  mysql-test/suite/rpl/r/rpl_colSize.result@1.1, 2007-07-29 18:10:31-04:00, cbell@mysql_cab_desk. +179 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 
    

  mysql-test/suite/rpl/r/rpl_colSize.result@1.0, 2007-07-29 18:10:30-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.1, 2007-07-29 18:10:31-04:00, cbell@mysql_cab_desk. +550 -0
    WL#3915  master's cols > slave
    
    new results
    

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.0, 2007-07-29 18:10:31-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.1, 2007-07-29 18:10:31-04:00, cbell@mysql_cab_desk. +550 -0
    WL#3915  master's cols > slave
    
    new results
    

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.0, 2007-07-29 18:10:31-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result@1.20, 2007-07-29 18:10:15-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new result file as a result of the change to the
    size of the tablemap log event.

  mysql-test/suite/rpl/r/rpl_row_create_table.result@1.16, 2007-07-29 18:10:15-04:00, cbell@mysql_cab_desk. +42 -42
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new result file as a result of the change to the
    size of the tablemap log event.

  mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result@1.1, 2007-07-29 18:10:32-04:00, cbell@mysql_cab_desk. +276 -0
    WL#3915  master's cols > slave
    
    new results
    

  mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result@1.0, 2007-07-29 18:10:32-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result@1.7, 2007-07-29 18:10:16-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new result file as a result of the change to the
    size of the tablemap log event.

  mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result@1.12, 2007-07-29 18:10:16-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new result file as a result of the change to the
    size of the tablemap log event.

  mysql-test/suite/rpl/r/rpl_row_log.result@1.23, 2007-07-29 18:10:17-04:00, cbell@mysql_cab_desk. +6 -6
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new result file as a result of the change to the
    size of the tablemap log event.

  mysql-test/suite/rpl/r/rpl_row_log_innodb.result@1.23, 2007-07-29 18:10:17-04:00, cbell@mysql_cab_desk. +6 -6
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new result file as a result of the change to the
    size of the tablemap log event.

  mysql-test/suite/rpl/r/rpl_row_max_relay_size.result@1.14, 2007-07-29 18:10:18-04:00, cbell@mysql_cab_desk. +10 -10
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new result file as a result of the change to the
    size of the tablemap log event.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.19, 2007-07-29 18:10:19-04:00, cbell@mysql_cab_desk. +9 -234
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new result file as a result of the change to the
    size of the tablemap log event.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.16, 2007-07-29 18:10:19-04:00, cbell@mysql_cab_desk. +9 -234
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new result file as a result of the change to the
    size of the tablemap log event.

  mysql-test/suite/rpl/r/rpl_row_until.result@1.11, 2007-07-29 18:10:20-04:00, cbell@mysql_cab_desk. +8 -8
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new result file as a result of the change to the
    size of the tablemap log event.

  mysql-test/suite/rpl/r/rpl_skip_error.result@1.17, 2007-07-29 18:10:20-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new result file as a result of the change to the
    size of the tablemap log event.

  mysql-test/suite/rpl/t/disabled.def@1.8, 2007-07-29 18:10:20-04:00, cbell@mysql_cab_desk. +1 -0
    WL#3915  master's cols > slave
    
    Disabled the rpl_stm_extraColmaster_ndb test because statement-based
    replication is not supported in NDB at this time. It can be enabled
    when statement-based replication for NDB is released.

  mysql-test/suite/rpl/t/rpl_colSize.test@1.1, 2007-07-29 18:10:27-04:00, cbell@mysql_cab_desk. +216 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new test designed to test the feature of having
    columns on the master that are smaller than what is on the slave. 
    

  mysql-test/suite/rpl/t/rpl_colSize.test@1.0, 2007-07-29 18:10:27-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt@1.1, 2007-07-29 18:10:28-04:00, cbell@mysql_cab_desk. +1 -0
    WL#3915  master's cols > slave
    
    option for innodb
    

  mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt@1.0, 2007-07-29 18:10:28-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt@1.1, 2007-07-29 18:10:28-04:00, cbell@mysql_cab_desk. +1 -0
    WL#3915  master's cols > slave
    
    option for innodb
    

  mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt@1.0, 2007-07-29 18:10:28-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl/t/rpl_extraColmaster_innodb.test@1.1, 2007-07-29 18:10:28-04:00, cbell@mysql_cab_desk. +15 -0
    WL#3915  master's cols > slave
    
    Test of innodb. Test runs in both statement- and row-based replication.
    

  mysql-test/suite/rpl/t/rpl_extraColmaster_innodb.test@1.0, 2007-07-29 18:10:28-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test@1.1, 2007-07-29 18:10:29-04:00, cbell@mysql_cab_desk. +13 -0
    WL#3915  master's cols > slave
    
    Test of myisam. Test runs in both statement- and row-based replication.
    
    

  mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test@1.0, 2007-07-29 18:10:29-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl/t/rpl_row_create_table.test@1.15, 2007-07-29 18:10:21-04:00, cbell@mysql_cab_desk. +5 -5
    WL#3228 : RBR using different table defs on slave/master
    
    This patch corrects binlog positions a result of the change to the
    size of the tablemap log event.

  mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test@1.1, 2007-07-29 18:10:30-04:00, cbell@mysql_cab_desk. +12 -0
    WL#3915  master's cols > slave
    
    Test of ndb. Test runs in row-based replication.
    

  mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test@1.0, 2007-07-29 18:10:30-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test@1.7, 2007-07-29 18:10:21-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch corrects binlog positions a result of the change to the
    size of the tablemap log event.

  mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test@1.1, 2007-07-29 18:10:30-04:00, cbell@mysql_cab_desk. +13 -0
    WL#3915  master's cols > slave
    
    Test of ndb. Test runs in statement-based replication.
    

  mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test@1.0, 2007-07-29 18:10:30-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result@1.31, 2007-07-29 18:10:22-04:00, cbell@mysql_cab_desk. +5 -5
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new result file as a result of the change to the
    size of the tablemap log event.

  mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result@1.16, 2007-07-29 18:10:22-04:00, cbell@mysql_cab_desk. +28 -28
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new result file as a result of the change to the
    size of the tablemap log event.

  sql/field.cc@1.402.2.1, 2007-07-29 18:10:23-04:00, cbell@mysql_cab_desk. +236 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch includes updates to the unpack() methods for the variable
    length fields. A new parameter was added (from_length) that is the
    value stored in the field_metadata of the table map from the table_def
    class. If the value is non-zero and less than what the field on the 
    slave is then use the from_length else use the original value from the
    field on the slave.

  sql/field.h@1.238.1.1, 2007-07-29 18:10:24-04:00, cbell@mysql_cab_desk. +32 -1
    L#3228 : RBR using different table defs on slave/master
    
    This patch includes updates to the unpack() methods for the variable
    length fields. A new parameter was added (from_length) that is the
    value stored in the field_metadata of the table map from the table_def
    class. 

  sql/log_event.cc@1.293, 2007-07-29 18:10:24-04:00, cbell@mysql_cab_desk. +238 -23
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds methods to calculate the field metadata size, prepare
    the field metadata for writing to the binlog, and additions to the
    Table_map_log_event::write_body method to include the field metadata 
    in the table map that is written to the binlog.
    
    WL#3915  master's cols > slave
    
    copying extra (slave's) fields returns early if master's table version is wider;
    removing assert in the way of master > slave cols.

  sql/log_event.h@1.153, 2007-07-29 18:10:25-04:00, cbell@mysql_cab_desk. +10 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds method declarations and variables needed to support
    storing field metadata in the table map that is written to the binlog.
    

  sql/rpl_record.cc@1.5, 2007-07-29 18:10:25-04:00, cbell@mysql_cab_desk. +38 -5
    WL#3228 : RBR using different table defs on slave/master
    
    This patch modifies the unpack_row() method to unpack fields passing in
    the value from the table_def class. This value is the extra field
    metadata stored there from the master.
    
    WL#3915  master's cols > slave
    
    adding a snippet that shift exectution curson donw the row skipping unknown by slave
    fields' data.

  sql/rpl_rli.h@1.17, 2007-07-29 18:10:26-04:00, cbell@mysql_cab_desk. +10 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds a helper function to retrieve the table_def for a given
    table in the RPL_TABLE_LIST structure.

  sql/rpl_utility.cc@1.9, 2007-07-29 18:10:26-04:00, cbell@mysql_cab_desk. +47 -52
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds a helper method that retrieves the correct size 
    parameter for the field. This method is used to compare the size as
    sent by the master with that on the slave for all types of fields that
    can vary in size and storage requirements. 
    
    WL#3915  master's cols > slave
    
    Remove warning message for master's cols > slave.

  sql/rpl_utility.h@1.8, 2007-07-29 18:10:27-04:00, cbell@mysql_cab_desk. +126 -6
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the table_def class constructor to pass in the raw
    data read from the table map and extract it into an array of dimension
    size (number of fields). It also adds a method to return the field 
    metadata for any field. The method returns the data stored in the table
    map or 0 if no data was stored for that field. Lastly, a method to return
    the results of field->maybe_null() is included so that the slave can
    determine if a field that is not on the slave is null.

ChangeSet@1.2536.33.5, 2007-07-29 21:12:54+05:00, gshchepa@gleb.loc +1 -0
  sp_head.cc:
    Post-merge fix.

  sql/sp_head.cc@1.284, 2007-07-29 21:12:17+05:00, gshchepa@gleb.loc +1 -1
    Post-merge fix.

ChangeSet@1.1810.3189.7, 2007-07-29 14:05:03+02:00, thek@adventure.(none) +1 -0
  Clean up patch
  - Removed unused variable.

  sql/sql_lex.cc@1.142.1.86, 2007-07-29 14:05:01+02:00, thek@adventure.(none) +0 -2
    - Removed unused variable

ChangeSet@1.2536.11.18, 2007-07-29 14:01:16+02:00, thek@adventure.(none) +1 -0
  Cleanup patch
  - Removed unused variable.

  sql/sql_lex.cc@1.253.1.2, 2007-07-29 14:01:13+02:00, thek@adventure.(none) +0 -2
    - Removed unused variable

ChangeSet@1.1810.3207.1, 2007-07-28 23:10:38+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #29834.
  Using view columns by their names during an execution of
  a prepared SELECT statement or a SELECT statement inside
  a SP caused a memory leak.

  mysql-test/r/sp.result@1.170.43.1, 2007-07-28 23:09:04+05:00, gshchepa@gleb.loc +71 -0
    Updated test case for bug #29834.

  mysql-test/t/sp.test@1.174.43.1, 2007-07-28 23:09:03+05:00, gshchepa@gleb.loc +74 -0
    Updated test case for bug #29834.

  sql/sql_base.cc@1.235.108.1, 2007-07-28 23:09:02+05:00, gshchepa@gleb.loc +3 -3
    Fixed bug #29834.
    The find_field_in_view function has been modified to
    use the execution memory root for the Item_direct_view_ref
    objects allocation at non-first executions of
    a PS/SP instead of the statement memory.

ChangeSet@1.1810.3205.1, 2007-07-28 16:02:29+04:00, evgen@moonbone.local +3 -0
  Bug#30020: Insufficient check led to a wrong info provided by the
  information schema table.
  
  The get_schema_views_record() function fills records in the view table of
  the informations schema with data about given views. Among other info
  the is_updatable flag is set. But the check whether the view is updatable or
  not wasn't covering all cases thus sometimes providing wrong info.
  This might led to a user confusion.
  
  Now the get_schema_views_record function additionally calls to the 
  view->can_be_merge() function to find out whether the view can be updated or
  not.

  mysql-test/r/view.result@1.138.1.72, 2007-07-28 16:01:23+04:00, evgen@moonbone.local +15 -0
    Added a test case for the bug#30020: Insufficient check led to a wrong info
    provided by the information schema table.

  mysql-test/t/view.test@1.126.1.64, 2007-07-28 16:00:31+04:00, evgen@moonbone.local +13 -0
    Added a test case for the bug#30020: Insufficient check led to a wrong info
    provided by the information schema table.

  sql/sql_show.cc@1.253.52.6, 2007-07-28 16:01:43+04:00, evgen@moonbone.local +3 -1
    Bug#30020: Insufficient check led to a wrong info provided by the
    information schema table.
    Now the get_schema_views_record function additionally calls to the 
    view->can_be_merge() function to find out whether the view can be updated or
    not.

ChangeSet@1.1810.3204.1, 2007-07-28 15:01:29+04:00, evgen@moonbone.local +3 -0
  Bug#29856: Insufficient buffer space led to a server crash.
  
  The subst_spvars function is used to create query string with SP variables 
  substituted with their values. This string is used later for the binary log
  and for the query cache. The problem is that the
  query_cache_send_result_to_client function requires some additional space
  after the query to store database name and query cache flags. This 
  space wasn't reserved by the subst_spvars function which led to a memory
  corruption and crash.
  
  Now the subst_spvars function reserves additional space for the query cache.

  mysql-test/r/query_cache.result@1.65.9.1, 2007-07-28 14:36:40+04:00, evgen@moonbone.local +119 -0
    Added a test case for the bug#29856: Insufficient buffer space led to a server crash.

  mysql-test/t/query_cache.test@1.49.6.1, 2007-07-28 14:36:38+04:00, evgen@moonbone.local +124 -0
    Added a test case for the bug#29856: Insufficient buffer space led to a server crash.

  sql/sp_head.cc@1.200.20.1, 2007-07-28 15:01:11+04:00, evgen@moonbone.local +81 -69
    Bug#29856: Insufficient buffer space led to a server crash.
    Now the subst_spvars function reserves additional space for the query cache.

ChangeSet@1.2536.31.1, 2007-07-28 14:10:56+05:00, holyfoot@mysql.com +2 -0
  rpl_session_var.test fixed to not depend on mysql_test_run parameters

  mysql-test/suite/rpl/r/rpl_session_var.result@1.8, 2007-07-28 14:10:54+05:00, holyfoot@mysql.com +3 -3
    result fixed

  mysql-test/suite/rpl/t/rpl_session_var.test@1.8, 2007-07-28 14:10:54+05:00, holyfoot@mysql.com +1 -1
    test fixed

ChangeSet@1.1810.3203.1, 2007-07-28 10:25:50+02:00, istruewing@chilla.local +1 -0
  Backported mi_test_all.sh from 5.1.

  myisam/mi_test_all.sh@1.7.2.1, 2007-07-28 10:25:45+02:00, istruewing@chilla.local +136 -136
    Backported mi_test_all.sh from 5.1.

ChangeSet@1.2536.17.10, 2007-07-28 08:42:43+03:00, gkodinov@magare.gmz +2 -0
  show_check.result:
    Addendum to thr fix for bug 30000:
    show procedure/function code defined only in debug builds
  show_check.test:
    Addendum to thr fix for bug 30000: 
    show procedure/function code defined only in debug builds

  mysql-test/r/show_check.result@1.122, 2007-07-28 08:42:05+03:00, gkodinov@magare.gmz +0 -2
    Addendum to thr fix for bug 30000:
    show procedure/function code defined only in debug builds

  mysql-test/t/show_check.test@1.85, 2007-07-28 08:41:02+03:00, gkodinov@magare.gmz +0 -2
    Addendum to thr fix for bug 30000: 
    show procedure/function code defined only in debug builds

ChangeSet@1.2529.43.1, 2007-07-27 17:20:43-06:00, tsmith@ramayana.hindu.god +1 -0
  Bug #29992: syslog error logging does not flush
  
  Don't use syslog by default; user will have to request it explicitly with the --syslog option.
  
  Use "sed -u" to get unbuffered output from sed, if it's supported.
  
  Otherwise, don't use sed at all - don't strip the timestamp from mysqld messages.
  
  Also, add new --syslog-tag=FOO option, which adds "-FOO" to the tag used when logging messages to syslog (i.e., mysqld-FOO or mysqld_safe-FOO)
  
  Also, explicitly mention where log messages are going, so user can more easily find them.
  
  Also, check if 'logger' is in the PATH, and log to the error log file if it can't be found.

  scripts/mysqld_safe.sh@1.91, 2007-07-27 17:20:42-06:00, tsmith@ramayana.hindu.god +91 -25
    Bug #29992: syslog error logging does not flush
    
    Don't use syslog by default; user will have to request it explicitly with the --syslog option.
    
    Use "sed -u" to get unbuffered output from sed, if it's supported.
    
    Otherwise, don't use sed at all - don't strip the timestamp from mysqld messages.
    
    Also, add new --syslog-tag=FOO option, which adds "-FOO" to the tag used when logging messages to syslog (i.e., mysqld-FOO or mysqld_safe-FOO)
    
    Also, explicitly mention where log messages are going, so user can more easily find them.
    
    Also, check if 'logger' is in the PATH, and log to the error log file if it can't be found.

ChangeSet@1.2536.30.2, 2007-07-27 17:41:34-04:00, iggy@alf.(none) +1 -0
  Bug#30103 CMake build solution does not remove auto-generated resources
  - Add CMake rule to remove files.
  - Manual merge.

  sql/CMakeLists.txt@1.42, 2007-07-27 17:41:31-04:00, iggy@alf.(none) +4 -0
    Bug#30103 CMake build solution does not remove auto-generated resources
    - Add CMake rule to remove files.

ChangeSet@1.2536.11.16, 2007-07-27 12:30:02-06:00, malff@weblab.(none) +1 -0
  manual merge

  sql/table.cc@1.299.2.2, 2007-07-27 12:29:59-06:00, malff@weblab.(none) +1 -1
    manual merge

ChangeSet@1.2536.20.2, 2007-07-27 12:19:36-06:00, malff@weblab.(none) +5 -0
  Code review changes

  sql/handler.cc@1.316.1.2, 2007-07-27 12:19:33-06:00, malff@weblab.(none) +2 -0
    Code review changes

  sql/lock.cc@1.111.1.2, 2007-07-27 12:19:33-06:00, malff@weblab.(none) +30 -11
    Code review changes

  sql/log.cc@1.282.1.19, 2007-07-27 12:19:33-06:00, malff@weblab.(none) +17 -25
    Code review changes

  sql/log.h@1.28, 2007-07-27 12:19:33-06:00, malff@weblab.(none) +0 -3
    Code review changes

  sql/sql_parse.cc@1.693.2.2, 2007-07-27 12:19:33-06:00, malff@weblab.(none) +1 -1
    Code review changes

ChangeSet@1.2536.11.14, 2007-07-27 21:50:37+04:00, anozdrin@ibm. +2 -0
  Fix merge.

  mysql-test/r/mysqldump.result@1.156.1.4, 2007-07-27 21:50:34+04:00, anozdrin@ibm. +46 -8
    Fix merge.

  mysql-test/r/show_check.result@1.119.1.2, 2007-07-27 21:50:34+04:00, anozdrin@ibm. +20 -0
    Fix merge.

ChangeSet@1.2536.10.6, 2007-07-27 19:14:08+02:00, df@pippilotta.erinye.com +1 -0
  BUG#20815 for the 5.1 branch

  CMakeLists.txt@1.34.1.1, 2007-07-27 19:14:06+02:00, df@pippilotta.erinye.com +3 -0
    BUG#20815 do not use 10MB of stack space per thread, enforce the previous 5.0 default of 1M

ChangeSet@1.2536.11.12, 2007-07-27 21:06:50+04:00, anozdrin@ibm. +2 -0
  Fix test so that it will be environment-independent.

  mysql-test/r/mysqldump.result@1.156.1.2, 2007-07-27 21:06:48+04:00, anozdrin@ibm. +2 -2
    Update result file.

  mysql-test/t/mysqldump.test@1.146.1.2, 2007-07-27 21:06:48+04:00, anozdrin@ibm. +2 -3
    Fix test so that it will be environment-independent.

ChangeSet@1.1810.3200.1, 2007-07-27 11:54:54-04:00, iggy@alf.(none) +1 -0
  Bug#30103 CMake build solution does not remove auto-generated resources
  - Add CMake rule to remove files.

  sql/CMakeLists.txt@1.1.8.1, 2007-07-27 11:54:51-04:00, iggy@alf.(none) +4 -0
    Bug#30103 CMake build solution does not remove auto-generated resources
    - Add CMake rule to remove files.

ChangeSet@1.1810.3196.5, 2007-07-27 17:39:07+02:00, kent@mysql.com +7 -0
  SSL/Makefile.am mysql-test/Makefile.am:
    Moved CERT files to where they are used, avoids conflict
    between two make files trying to install the same CERTs
  SSL/*.pem, 
    Move: SSL/*.pem -> mysql-test/std_data/

  SSL/Makefile.am@1.1.5.1, 2007-07-27 17:20:46+02:00, kent@mysql.com +1 -3
    Moved CERT files to where they are used, avoids conflict
    between two make files trying to install the same CERTs

  mysql-test/Makefile.am@1.66.1.28, 2007-07-27 17:21:14+02:00, kent@mysql.com +1 -17

  mysql-test/std_data/cacert.pem@1.5.3.1, 2007-07-26 23:51:53+02:00, kent@mysql.com +0 -0
    Rename: SSL/cacert.pem -> mysql-test/std_data/cacert.pem

  mysql-test/std_data/client-cert.pem@1.5.3.1, 2007-07-26 23:51:53+02:00, kent@mysql.com +0 -0
    Rename: SSL/client-cert.pem -> mysql-test/std_data/client-cert.pem

  mysql-test/std_data/client-key.pem@1.4.3.1, 2007-07-26 23:51:53+02:00, kent@mysql.com +0 -0
    Rename: SSL/client-key.pem -> mysql-test/std_data/client-key.pem

  mysql-test/std_data/server-cert.pem@1.5.4.1, 2007-07-26 23:51:53+02:00, kent@mysql.com +0 -0
    Rename: SSL/server-cert.pem -> mysql-test/std_data/server-cert.pem

  mysql-test/std_data/server-key.pem@1.4.3.1, 2007-07-26 23:51:53+02:00, kent@mysql.com +0 -0
    Rename: SSL/server-key.pem -> mysql-test/std_data/server-key.pem

ChangeSet@1.1810.3199.1, 2007-07-27 16:56:29+02:00, thek@adventure.(none) +5 -0
  Bug #29929 LOCK TABLES does not pre-lock tables used in triggers of the locked tables
  
  When a table was explicitly locked with LOCK TABLES no associated
  tables from any related trigger on the subject table were locked.
  As a result of this the user could experience unexpected locking
  behavior and statement failures similar to "failed: 1100: Table'xx'
  was not locked with LOCK TABLES".
  
  This patch fixes this problem by making sure triggers are
  pre-loaded on any statement if the subject table was explicitly
  locked with LOCK TABLES.

  mysql-test/r/sp-prelocking.result@1.2.1.6, 2007-07-27 16:56:27+02:00, thek@adventure.(none) +30 -0
    Added test case

  mysql-test/t/sp-prelocking.test@1.2.1.7, 2007-07-27 16:56:28+02:00, thek@adventure.(none) +31 -0
    Added test case

  sql/sql_lex.cc@1.142.1.85, 2007-07-27 16:56:28+02:00, thek@adventure.(none) +132 -3
    - Moved some conditional logic out of the table iteration.
    - Added event map values for LOCK TABLE command.

  sql/table.cc@1.160.53.1, 2007-07-27 16:56:28+02:00, thek@adventure.(none) +0 -129
    - Refactored set_trg_event_tpye into the two simpler functions set_trg_event_map
      and set_trg_event_map as methods for manipulating the table event map.
      The original function was only called from st_lex::set_trg_event_type_for_tables
      so it was possible to move the event map creation logic to this function as
      a loop optimization.

  sql/table.h@1.102.1.45, 2007-07-27 16:56:28+02:00, thek@adventure.(none) +0 -1
    - Refactored set_trg_event_tpye into the two simpler functions set_trg_event_map
      and set_trg_event_map as methods for manipulating the table event map.
      The original function was only called from st_lex::set_trg_event_type_for_tables
      so it was possible to move the event map creation logic to this function as
      a loop optimization.

ChangeSet@1.2536.25.1, 2007-07-27 17:55:39+03:00, gkodinov@magare.gmz +3 -0
  Bug #30000: SHOW commands once again ends up in the 
   slow query log
  Disable the SHOW commands to appear in the show query
  log.
  Update the commands type array.

  mysql-test/r/show_check.result@1.121, 2007-07-27 17:55:38+03:00, gkodinov@magare.gmz +65 -5
    Bug #30000: test case

  mysql-test/t/show_check.test@1.84, 2007-07-27 17:55:38+03:00, gkodinov@magare.gmz +64 -0
    Bug #30000: test case

  sql/sql_parse.cc@1.694.1.1, 2007-07-27 17:55:38+03:00, gkodinov@magare.gmz +31 -5
    Bug #30000: skip SHOW commands from the
    slow query log.

ChangeSet@1.2536.17.7, 2007-07-27 17:29:48+03:00, gkodinov@magare.gmz +2 -0
  fixing the 5.1-opt merge of the fix for bug 29571: 
  cannot check the statments in the binlog for row based 
  replication.

  mysql-test/extra/rpl_tests/rpl_insert_delayed.test@1.8, 2007-07-27 17:29:46+03:00, gkodinov@magare.gmz +27 -14
    fixing the 5.1-opt merge of the fix for bug 29571: 
    cannot check the statments in the binlog for row based 
    replication.

  mysql-test/suite/rpl/r/rpl_row_insert_delayed.result@1.4, 2007-07-27 17:29:46+03:00, gkodinov@magare.gmz +0 -12
    fixing the 5.1-opt merge of the fix for bug 29571: 
    cannot check the statments in the binlog for row based 
    replication.

ChangeSet@1.2536.11.10, 2007-07-27 18:20:17+04:00, anozdrin@ibm. +3 -0
  Fix for BUG#30027: mysqldump does not dump views properly.
  
  mysqldump generates view defitions in two stages:
  
    - dump CREATE TABLE statements for the temporary tables.  For each view a
      temporary table, that has the same structure as the view is created.
  
    - dump DROP TABLE statements for the temporary tables and CREATE VIEW
      statements for the view.
  
  This approach is required because views can have dependencies on each other
  (a view can use other views). So, they should be created in the particular
  order. mysqldump however is not smart enough, so in order to resolve
  dependencies it creates temporary tables first of all.
  
  The problem was that mysqldump might have generated incorrect dump for the
  temporary table when a view has non-ASCII column name. That happened when
  default-character-set is not utf8.
  
  The fix is to:
  
    1. Switch character_set_client for the mysqldump's connection to binary
       before issuing SHOW FIELDS statement in order to avoid conversion.
      
    2. Dump switch character_set_client statements to UTF8 and back for
       CREATE TABLE statement that is issued to create temporary table.

  client/mysqldump.c@1.286.2.1, 2007-07-27 18:20:15+04:00, anozdrin@ibm. +39 -30
    1. Switch character_set_results for mysqldump's connection to
    binary before SHOW FIELDS in order to avoid conversion to client
    character set.
    
    2. Dump switch character_set_client statements to UTF8 and back
    for CREATE TABLE statement.

  mysql-test/r/mysqldump.result@1.156.1.1, 2007-07-27 18:20:15+04:00, anozdrin@ibm. +69 -0
    Update result file.

  mysql-test/t/mysqldump.test@1.146.1.1, 2007-07-27 18:20:15+04:00, anozdrin@ibm. +58 -0
    Test case for BUG#30027.

ChangeSet@1.1810.3186.2, 2007-07-27 18:42:25+05:00, holyfoot@mysql.com +5 -0
  Bug #29878 Garbage data generation when executing SESSION_USER() on a slave.
  
  Item_func_user doesn't calculate anything in it's val_str() method,
  just returns saved str_value.
  Though Item::save_in_field method can destroy str_value, relying on
  val_str() return. As a result we get the garbage stored in field.
  
  We cannot use Item::save_in_field implementation for Item_func_user,
  reimplement it in simpler way.

  mysql-test/r/rpl_session_var.result@1.5.1.1, 2007-07-27 18:42:24+05:00, holyfoot@mysql.com +10 -0
    Bug #29878 Garbage data generation when executing SESSION_USER() on a slave.
    
    test result

  mysql-test/t/rpl_session_var.test@1.5.1.1, 2007-07-27 18:42:24+05:00, holyfoot@mysql.com +22 -0
    Bug #29878 Garbage data generation when executing SESSION_USER() on a slave.
    
    test case

  sql/item.cc@1.113.1.164, 2007-07-27 18:42:24+05:00, holyfoot@mysql.com +38 -14
    Bug #29878 Garbage data generation when executing SESSION_USER() on a slave.
    
    duplicating code moved to Item::save_str_in_field

  sql/item.h@1.183.1.54, 2007-07-27 18:42:24+05:00, holyfoot@mysql.com +5 -1
    Bug #29878 Garbage data generation when executing SESSION_USER() on a slave.
    
    duplicating code moved to Item::save_str_in_field

  sql/item_strfunc.h@1.101.1.22, 2007-07-27 18:42:24+05:00, holyfoot@mysql.com +4 -0
    Bug #29878 Garbage data generation when executing SESSION_USER() on a slave.
    
    Item_func_user::save_in_field implemented as simple storing str_value

ChangeSet@1.2536.22.2, 2007-07-27 15:41:27+02:00, joerg@debian.(none) +51 -0
  Fix a bad BitKeeper dependency structure for the "funcs_1" suite:
  
  Step 2:
  Restore the 5.1 contents in the 5.0-dependent files.

  mysql-test/suite/funcs_1/cursors/cursors_master.test@1.4, 2007-07-27 15:40:58+02:00, joerg@debian.(none) +0 -1
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@1.5, 2007-07-27 15:40:58+02:00, joerg@debian.(none) +4 -4
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/datadict/datadict_tables.inc@1.4, 2007-07-27 15:40:58+02:00, joerg@debian.(none) +1 -1
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.5, 2007-07-27 15:40:58+02:00, joerg@debian.(none) +2635 -463
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/innodb_func_view.result@1.5, 2007-07-27 15:40:58+02:00, joerg@debian.(none) +4826 -4660
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/innodb_storedproc.result@1.4, 2007-07-27 15:41:02+02:00, joerg@debian.(none) +17220 -17650
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/innodb_storedproc_02.result@1.4, 2007-07-27 15:41:03+02:00, joerg@debian.(none) +22 -14
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/innodb_storedproc_10.result@1.4, 2007-07-27 15:41:03+02:00, joerg@debian.(none) +5 -5
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/innodb_trig_0102.result@1.4, 2007-07-27 15:41:03+02:00, joerg@debian.(none) +10 -5
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/innodb_trig_03.result@1.4, 2007-07-27 15:41:03+02:00, joerg@debian.(none) +123 -158
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/innodb_trig_0407.result@1.4, 2007-07-27 15:41:03+02:00, joerg@debian.(none) +5 -5
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/innodb_trig_08.result@1.5, 2007-07-27 15:41:03+02:00, joerg@debian.(none) +33 -25
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/innodb_trig_09.result@1.4, 2007-07-27 15:41:03+02:00, joerg@debian.(none) +5 -5
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result@1.4, 2007-07-27 15:41:03+02:00, joerg@debian.(none) +14 -14
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/innodb_trig_frkey.result@1.4, 2007-07-27 15:41:03+02:00, joerg@debian.(none) +1 -1
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/innodb_views.result@1.5, 2007-07-27 15:41:03+02:00, joerg@debian.(none) +48 -48
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.5, 2007-07-27 15:41:04+02:00, joerg@debian.(none) +2635 -463
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/memory_func_view.result@1.5, 2007-07-27 15:41:04+02:00, joerg@debian.(none) +4826 -4660
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/memory_storedproc.result@1.4, 2007-07-27 15:41:08+02:00, joerg@debian.(none) +17068 -17504
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/memory_storedproc_02.result@1.4, 2007-07-27 15:41:08+02:00, joerg@debian.(none) +22 -14
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/memory_storedproc_10.result@1.4, 2007-07-27 15:41:08+02:00, joerg@debian.(none) +5 -5
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/memory_trig_0102.result@1.4, 2007-07-27 15:41:09+02:00, joerg@debian.(none) +10 -5
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/memory_trig_03.result@1.4, 2007-07-27 15:41:09+02:00, joerg@debian.(none) +123 -158
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/memory_trig_0407.result@1.4, 2007-07-27 15:41:09+02:00, joerg@debian.(none) +5 -5
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/memory_trig_08.result@1.5, 2007-07-27 15:41:09+02:00, joerg@debian.(none) +33 -25
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/memory_trig_09.result@1.4, 2007-07-27 15:41:09+02:00, joerg@debian.(none) +5 -5
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/memory_trig_1011ext.result@1.4, 2007-07-27 15:41:09+02:00, joerg@debian.(none) +14 -14
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/memory_views.result@1.5, 2007-07-27 15:41:09+02:00, joerg@debian.(none) +48 -48
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.5, 2007-07-27 15:41:09+02:00, joerg@debian.(none) +2635 -463
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/myisam_func_view.result@1.5, 2007-07-27 15:41:09+02:00, joerg@debian.(none) +4826 -4660
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/myisam_storedproc.result@1.4, 2007-07-27 15:41:14+02:00, joerg@debian.(none) +17068 -17504
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/myisam_storedproc_02.result@1.4, 2007-07-27 15:41:14+02:00, joerg@debian.(none) +22 -14
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/myisam_storedproc_10.result@1.4, 2007-07-27 15:41:14+02:00, joerg@debian.(none) +5 -5
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/myisam_trig_0102.result@1.4, 2007-07-27 15:41:14+02:00, joerg@debian.(none) +10 -5
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/myisam_trig_03.result@1.4, 2007-07-27 15:41:14+02:00, joerg@debian.(none) +123 -158
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/myisam_trig_0407.result@1.4, 2007-07-27 15:41:14+02:00, joerg@debian.(none) +5 -5
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/myisam_trig_08.result@1.5, 2007-07-27 15:41:14+02:00, joerg@debian.(none) +33 -25
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/myisam_trig_09.result@1.4, 2007-07-27 15:41:14+02:00, joerg@debian.(none) +5 -5
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result@1.4, 2007-07-27 15:41:14+02:00, joerg@debian.(none) +14 -14
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/r/myisam_views.result@1.5, 2007-07-27 15:41:15+02:00, joerg@debian.(none) +7605 -7588
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/storedproc/storedproc_02.inc@1.4, 2007-07-27 15:41:15+02:00, joerg@debian.(none) +19 -14
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/storedproc/storedproc_10.inc@1.4, 2007-07-27 15:41:15+02:00, joerg@debian.(none) +5 -5
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc@1.4, 2007-07-27 15:41:15+02:00, joerg@debian.(none) +16 -19
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/triggers/triggers_0102.inc@1.4, 2007-07-27 15:41:15+02:00, joerg@debian.(none) +13 -5
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/triggers/triggers_03.inc@1.4, 2007-07-27 15:41:15+02:00, joerg@debian.(none) +51 -93
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/triggers/triggers_0407.inc@1.4, 2007-07-27 15:41:15+02:00, joerg@debian.(none) +5 -5
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/triggers/triggers_08.inc@1.4, 2007-07-27 15:41:15+02:00, joerg@debian.(none) +23 -16
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/triggers/triggers_09.inc@1.4, 2007-07-27 15:41:16+02:00, joerg@debian.(none) +4 -4
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc@1.4, 2007-07-27 15:41:16+02:00, joerg@debian.(none) +12 -12
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/views/func_view.inc@1.4, 2007-07-27 15:41:16+02:00, joerg@debian.(none) +39 -70
    Restore the 5.1 contents in the 5.0-dependent file.

  mysql-test/suite/funcs_1/views/views_master.inc@1.5, 2007-07-27 15:41:16+02:00, joerg@debian.(none) +37 -37
    Restore the 5.1 contents in the 5.0-dependent file.

ChangeSet@1.2536.11.9, 2007-07-27 17:39:01+04:00, anozdrin@ibm. +4 -0
  Fix for BUG#28030: test im_instance_conf fails with an assert.
  
  The problem was a race condition on shutdown -- when IM got shutdown
  request while a guarded mysqld is starting. In this case the Guardian
  thread tried to stop the mysqld, but might fail if the mysqld hadn't
  created pid-file so far. When this happened, the mysqld-monitor thread
  didn't stop, so the assert in Thread_registry happened.
  
  The fix is to make several attempts to stop mysqld if it is active.

  server-tools/instance-manager/guardian.cc@1.43, 2007-07-27 17:38:59+04:00, anozdrin@ibm. +30 -1
    Try to stop mysqld several times if it is still active.

  server-tools/instance-manager/instance.cc@1.55, 2007-07-27 17:38:59+04:00, anozdrin@ibm. +5 -3
    Make Instance::kill_mysqld() to return operation status.

  server-tools/instance-manager/instance.h@1.21, 2007-07-27 17:38:59+04:00, anozdrin@ibm. +1 -1
    Make Instance::kill_mysqld() to return operation status.

  server-tools/instance-manager/thread_registry.cc@1.23, 2007-07-27 17:38:59+04:00, anozdrin@ibm. +6 -2
    Log unregistered thread ids.

ChangeSet@1.2536.23.1, 2007-07-27 15:37:37+02:00, serg@janus.mylan +3 -0
  Bug #30094 mi_test_all: assertion failure
  updated to keypart_map api

  storage/myisam/mi_test1.c@1.36, 2007-07-27 15:37:33+02:00, serg@janus.mylan +3 -2
    Bug #30094 mi_test_all: assertion failure
    updated to keypart_map api

  storage/myisam/mi_test2.c@1.37, 2007-07-27 15:37:33+02:00, serg@janus.mylan +13 -10
    Bug #30094 mi_test_all: assertion failure
    updated to keypart_map api
    prefix char keys are not supported anymore

  storage/myisam/mi_test3.c@1.23, 2007-07-27 15:37:33+02:00, serg@janus.mylan +4 -4
    Bug #30094 mi_test_all: assertion failure
    updated to keypart_map api

ChangeSet@1.1810.3194.4, 2007-07-27 15:14:21+02:00, jperkin@production.mysql.com +1 -0
  More fixes and cleanups for bug#28585:
  
    - make the 'dist-hook' from top-level Makefile work again.
    - we can find my_print_defaults from --basedir by parsing command
      line arguments prior to running my_print_defaults.
    - take advantage of additional command line parsing and allow the
      --no-defaults etc arguments to work anywhere rather than having
      to be the first argument.
    - find SQL files either from binary archive or source install.
    - consolidate and tidy code and error messages.

  scripts/mysql_install_db.sh@1.64.1.35, 2007-07-27 15:05:51+02:00, jperkin@production.mysql.com +12 -3
    Consolidate error messages.

  scripts/mysql_install_db.sh@1.64.1.34, 2007-07-27 14:52:32+02:00, jperkin@production.mysql.com +42 -20
    Add find_in_basedir() to reduce copy+paste when finding files
    in either a binary distribution or installed source compile.
    Use it to correctly find location of SQL files and adjust
    $pkgdatadir accordingly.

  scripts/mysql_install_db.sh@1.64.1.33, 2007-07-27 14:51:06+02:00, jperkin@production.mysql.com +1 -1
    Quote variable correctly.

  scripts/mysql_install_db.sh@1.64.1.32, 2007-07-27 13:12:05+02:00, jperkin@production.mysql.com +35 -17
    Perform an initial parse of command line arguments to
    get --basedir and attempt to find my_print_defaults
    inside.
    This also allows us to move the check for --no-defaults etc
    into the main parse routine and remove the limitation that
    it must be the first argument.

  scripts/mysql_install_db.sh@1.64.1.31, 2007-07-27 13:01:12+02:00, jperkin@production.mysql.com +2 -2
    Find SQL scripts correctly if using --basedir

ChangeSet@1.2539.1.1, 2007-07-27 15:06:46+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#27972 (Test failure for rpl_ndb_circular_simplex):
  Removing a RESET MASTER inside the test since that will change binlog
  positions in such a manner that the dual masters lose track of where
  they acually are.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result@1.7, 2007-07-27 15:06:40+02:00, mats@kindahl-laptop.dnsalias.net +8 -1
    Result change.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.4.1.1, 2007-07-27 15:06:40+02:00, mats@kindahl-laptop.dnsalias.net +0 -1
    Enabling test.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test@1.9, 2007-07-27 15:06:40+02:00, mats@kindahl-laptop.dnsalias.net +0 -1
    Removing a RESET MASTER since circular replication don't look kindly
    on truncating binlogs.

ChangeSet@1.1810.3189.5, 2007-07-27 16:37:29+04:00, kostja@bodhi.(none) +9 -0
  A fix and a test case for Bug#24918 drop table and lock / inconsistent
  between perm and temp tables. Review fixes.
  
  The original bug report complains that if we locked a temporary table
  with LOCK TABLES statement, we would not leave LOCK TABLES mode
  when this temporary table is dropped.
  
  Additionally, the bug was escalated when it was discovered than
  when a temporary transactional table that was previously
  locked with LOCK TABLES statement was dropped, futher actions with
  this table, such as UNLOCK TABLES, would lead to a crash.
  
  The problem originates from incomplete support of transactional temporary
  tables. When we added calls to handler::store_lock()/handler::external_lock()
  to operations that work with such tables, we only covered the normal
  server code flow and did not cover LOCK TABLES mode. 
  In LOCK TABLES mode, ::external_lock(LOCK) would sometimes be called without
  matching ::external_lock(UNLOCK), e.g. when a transactional temporary table
  was dropped. Additionally, this table would be left in the list of LOCKed 
  TABLES.
  
  The patch aims to address this inadequacy. Now, whenever an instance
  of 'handler' is destroyed, we assert that it was priorly
  external_lock(UNLOCK)-ed. All the places that violate this assert
  were fixed.
  
  This patch introduces no changes in behavior -- the discrepancy in
  behavior will be fixed when we start calling ::store_lock()/::external_lock()
  for all tables, regardless whether they are transactional or not, 
  temporary or not.

  mysql-test/t/innodb_mysql.test@1.3.40.1, 2007-07-27 16:37:26+04:00, kostja@bodhi.(none) +34 -0
    Add a test case for Bug#24918

  mysql-test/r/innodb_mysql.result@1.3.21.1, 2007-07-27 16:37:26+04:00, kostja@bodhi.(none) +28 -0
    Update test results (Bug#24918)

  sql/handler.h@1.138.2.49, 2007-07-27 16:37:26+04:00, kostja@bodhi.(none) +37 -3
    Make handler::external_lock() a protected method. Backport from 5.1 its
    public wrapper handler::ha_external_lock().
    Assert that the handler is not closed if it is still locked.

  sql/lock.cc@1.64.1.34, 2007-07-27 16:37:26+04:00, kostja@bodhi.(none) +29 -6
    In mysql_lock_tables only call lock_external() for the list of tables that
    we called store_lock() for. 
    E.g. get_lock_data() does not add non-transactional temporary tables to the
    lock list, so lock_external() should not be called for them.
    
    Use handler::ha_external_lock() instead of handler::external_lock().
    
    Add comments for mysql_lock_remove(), parameterize one strange
    side effect that it has. At least in one place where mysql_lock_remove
    is used, this side effect is not desired (DROP TABLE). The parameter
    will be dropped in 5.1, along with the side effect.

  sql/mysql_priv.h@1.290.1.169, 2007-07-27 16:37:26+04:00, kostja@bodhi.(none) +2 -1
    Update declaration of mysql_lock_remove().

  sql/opt_range.cc@1.159.1.91, 2007-07-27 16:37:27+04:00, kostja@bodhi.(none) +3 -3
    Deploy handler::ha_external_lock() instead of handler::external_lock()

  sql/sql_base.cc@1.235.107.1, 2007-07-27 16:37:27+04:00, kostja@bodhi.(none) +36 -4
    When closing a temporary table, remove the table from the list of LOCKed 
    TABLES of this thread, in case it's there. 
    It's there if it is a transactional temporary table.
    Use a new declaration of mysql_lock_remove().

  sql/sql_class.h@1.230.1.113, 2007-07-27 16:37:27+04:00, kostja@bodhi.(none) +18 -6
    Extend the comment for THD::temporary_tables.

  sql/sql_table.cc@1.239.62.1, 2007-07-27 16:37:27+04:00, kostja@bodhi.(none) +5 -5
    Deploy handler::ha_external_lock() instead of handler::external_lock()

ChangeSet@1.2536.17.6, 2007-07-27 15:36:10+03:00, gkodinov@magare.gmz +1 -0
  portation of the test case for bug 29571 to cover row replication

  mysql-test/suite/rpl/r/rpl_row_insert_delayed.result@1.3, 2007-07-27 15:36:08+03:00, gkodinov@magare.gmz +26 -0
    portation of the test case for bug 29571 to cover row replication

ChangeSet@1.2536.22.1, 2007-07-27 13:32:32+02:00, joerg@debian.(none) +396 -0
  Fix a bad BitKeeper dependency structure for the "funcs_1" suite:
  
  The files below "mysql-test/suite/funcs_1" in version 5.1
  did not depend on the equivalent ones in 5.0,
  probably because they had been checked in independent of each other
  in both versions.
  
  Step 1:
  Foreach file F in the suite that has a "deleted" counterpart D, use
      bk rm $F
      bk mv $D $F
  to get those files into the 5.1 suite that (for BK) depend on 5.0.

  BitKeeper/deleted/.del-DataGen_local.pl~3239b01670d34dde@1.2, 2007-07-27 12:58:09+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/lib/DataGen_local.pl

  BitKeeper/deleted/.del-DataGen_modify.pl~b7fa80d2d927dae6@1.2, 2007-07-27 12:58:09+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/lib/DataGen_modify.pl

  BitKeeper/deleted/.del-README.txt@1.2, 2007-07-27 12:59:14+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/README.txt

  BitKeeper/deleted/.del-bitdata_master.test~6c37e095e0a9add9@1.2, 2007-07-27 12:57:49+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/bitdata/bitdata_master.test

  BitKeeper/deleted/.del-cleanup_sp_tb.inc~e56fdf367dc4920f@1.2, 2007-07-27 12:58:37+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc

  BitKeeper/deleted/.del-create_database.inc~ef2ebad71f178a1c@1.2, 2007-07-27 12:58:02+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/create_database.inc

  BitKeeper/deleted/.del-create_user_lowest_priv.inc~6f636433dda5160c@1.2, 2007-07-27 12:58:02+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc

  BitKeeper/deleted/.del-create_user_no_super.inc~1d0bed25cc65132f@1.2, 2007-07-27 12:58:03+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/create_user_no_super.inc

  BitKeeper/deleted/.del-cursors_master.test~9dcdbd03ab922cc0@1.2, 2007-07-27 12:57:49+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/cursors/cursors_master.test

  BitKeeper/deleted/.del-datadict_bug_12777.inc~672dfea7d7dba2b8@1.2, 2007-07-27 12:57:56+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc

  BitKeeper/deleted/.del-datadict_load.inc~ff1ec79eab8c431c@1.3, 2007-07-27 12:57:57+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_load.inc

  BitKeeper/deleted/.del-datadict_master.inc~94ae7b735ad01d72@1.3, 2007-07-27 12:57:57+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_master.inc

  BitKeeper/deleted/.del-datadict_show_schema.inc~b6dc1e8ed481fa92@1.3, 2007-07-27 12:57:58+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc

  BitKeeper/deleted/.del-datadict_show_table_design.inc~517436f76de0716b@1.2, 2007-07-27 12:57:58+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc

  BitKeeper/deleted/.del-datadict_tables.inc~cf3c01f9d1cd0cdf@1.2, 2007-07-27 12:57:59+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_tables.inc

  BitKeeper/deleted/.del-datadict_tables_error.inc~5516c7f2d254fdee@1.2, 2007-07-27 12:57:59+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc

  BitKeeper/deleted/.del-datadict_tables_error_1.inc~18e7ad369f9eb3fd@1.2, 2007-07-27 12:57:59+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc

  BitKeeper/deleted/.del-datadict_tables_error_1044.inc~3cfe7748d18be96c@1.2, 2007-07-27 12:58:00+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc

  BitKeeper/deleted/.del-datadict_tables_error_1049.inc~61e79841bf09fc97@1.2, 2007-07-27 12:58:00+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc

  BitKeeper/deleted/.del-datadict_tables_error_1051.inc~e637de2d82fa7519@1.2, 2007-07-27 12:58:01+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc

  BitKeeper/deleted/.del-datadict_tables_error_1146.inc~3f6d5feff7f0e9d0@1.2, 2007-07-27 12:58:01+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc

  BitKeeper/deleted/.del-datadict_tables_error_1288.inc~2f5deb63fbe93e71@1.2, 2007-07-27 12:58:01+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc

  BitKeeper/deleted/.del-disabled.def~5839f38d337055cd@1.3, 2007-07-27 12:58:42+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/disabled.def

  BitKeeper/deleted/.del-func_view.inc~f237e7bc7e6cfcbc@1.2, 2007-07-27 12:59:10+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/views/func_view.inc

  BitKeeper/deleted/.del-fv1.inc~87b440f98d8b8193@1.2, 2007-07-27 12:59:11+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/views/fv1.inc

  BitKeeper/deleted/.del-fv2.inc~26896746173f9122@1.2, 2007-07-27 12:59:11+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/views/fv2.inc

  BitKeeper/deleted/.del-fv_cast.inc~ef53731c7c6dcd27@1.2, 2007-07-27 12:59:12+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/views/fv_cast.inc

  BitKeeper/deleted/.del-fv_if1.inc~86c887a184ab39eb@1.2, 2007-07-27 12:59:12+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/views/fv_if1.inc

  BitKeeper/deleted/.del-fv_if2.inc~483e3f7a24f7e55c@1.2, 2007-07-27 12:59:13+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/views/fv_if2.inc

  BitKeeper/deleted/.del-fv_ifnull.inc~fbffea1ccd756112@1.2, 2007-07-27 12:59:13+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/views/fv_ifnull.inc

  BitKeeper/deleted/.del-innodb__datadict.result~c02e1f54796a8ca6@1.4, 2007-07-27 12:58:10+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb__datadict.result

  BitKeeper/deleted/.del-innodb__datadict.test~56554dd847c45d1b@1.2, 2007-07-27 12:58:42+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb__datadict.test

  BitKeeper/deleted/.del-innodb__load.result~e93101337aed3e72@1.2, 2007-07-27 12:58:10+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb__load.result

  BitKeeper/deleted/.del-innodb__load.test~7085d9e6cde80a45@1.2, 2007-07-27 12:58:43+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb__load.test

  BitKeeper/deleted/.del-innodb_bitdata.result~799181269a7c3f76@1.2, 2007-07-27 12:58:11+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_bitdata.result

  BitKeeper/deleted/.del-innodb_bitdata.test~85aa8297cea412f0@1.2, 2007-07-27 12:58:43+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_bitdata.test

  BitKeeper/deleted/.del-innodb_cursors.result~5501346a312eb2c@1.2, 2007-07-27 12:58:11+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_cursors.result

  BitKeeper/deleted/.del-innodb_cursors.test~b2f689e5aad9ed61@1.2, 2007-07-27 12:58:43+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_cursors.test

  BitKeeper/deleted/.del-innodb_func_view.result~40832cbc3cd01357@1.3, 2007-07-27 12:58:11+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_func_view.result

  BitKeeper/deleted/.del-innodb_func_view.test~cefb7d1dd6010a54@1.2, 2007-07-27 12:58:44+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_func_view.test

  BitKeeper/deleted/.del-innodb_storedproc.result~f519851b98532739@1.2, 2007-07-27 12:58:12+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_storedproc.result

  BitKeeper/deleted/.del-innodb_storedproc.test~59836b12f28c524a@1.2, 2007-07-27 12:58:45+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_storedproc.test

  BitKeeper/deleted/.del-innodb_storedproc_02.result~4183d0a85e3d9c3f@1.2, 2007-07-27 12:58:12+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_02.result

  BitKeeper/deleted/.del-innodb_storedproc_02.test~b8a1d59320d17ccd@1.2, 2007-07-27 12:58:45+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_02.test

  BitKeeper/deleted/.del-innodb_storedproc_03.result~a27277dc4cfcd8b4@1.2, 2007-07-27 12:58:13+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_03.result

  BitKeeper/deleted/.del-innodb_storedproc_03.test~f0a04b626962c3ae@1.2, 2007-07-27 12:58:45+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_03.test

  BitKeeper/deleted/.del-innodb_storedproc_06.result~ebc1ed638105c6a4@1.2, 2007-07-27 12:58:13+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_06.result

  BitKeeper/deleted/.del-innodb_storedproc_06.test~f0c4a7598abaa44@1.2, 2007-07-27 12:58:46+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_06.test

  BitKeeper/deleted/.del-innodb_storedproc_07.result~aef68b204aae26a5@1.2, 2007-07-27 12:58:14+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_07.result

  BitKeeper/deleted/.del-innodb_storedproc_07.test~f5fc9e0a296cff76@1.2, 2007-07-27 12:58:46+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_07.test

  BitKeeper/deleted/.del-innodb_storedproc_08.result~110d457978e5bb08@1.2, 2007-07-27 12:58:14+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_08.result

  BitKeeper/deleted/.del-innodb_storedproc_08.test~96c9f3ecc7801edb@1.2, 2007-07-27 12:58:47+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_08.test

  BitKeeper/deleted/.del-innodb_storedproc_10.result~bac006c3f8720ff7@1.2, 2007-07-27 12:58:15+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_10.result

  BitKeeper/deleted/.del-innodb_storedproc_10.test~368950a6728faf08@1.2, 2007-07-27 12:58:47+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_10.test

  BitKeeper/deleted/.del-innodb_tb1.inc~7e6d03d2ddf3b609@1.2, 2007-07-27 12:58:03+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/innodb_tb1.inc

  BitKeeper/deleted/.del-innodb_tb1.txt~7aac0fc74aa9562b@1.2, 2007-07-27 12:57:50+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/data/innodb_tb1.txt

  BitKeeper/deleted/.del-innodb_tb2.inc~2ab09e131335c5ac@1.2, 2007-07-27 12:58:03+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/innodb_tb2.inc

  BitKeeper/deleted/.del-innodb_tb2.txt~9e942b8278568a29@1.2, 2007-07-27 12:57:50+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/data/innodb_tb2.txt

  BitKeeper/deleted/.del-innodb_tb3.inc~ce29b178da64097@1.2, 2007-07-27 12:58:04+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/innodb_tb3.inc

  BitKeeper/deleted/.del-innodb_tb3.txt~2799425a5cda8773@1.2, 2007-07-27 12:57:51+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/data/innodb_tb3.txt

  BitKeeper/deleted/.del-innodb_tb4.inc~912d46a6ce99beb@1.2, 2007-07-27 12:58:04+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/innodb_tb4.inc

  BitKeeper/deleted/.del-innodb_tb4.txt~4944d7e7a6e18007@1.2, 2007-07-27 12:57:51+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/data/innodb_tb4.txt

  BitKeeper/deleted/.del-innodb_trig_0102.result~552e7936f9c3e8b1@1.3, 2007-07-27 12:58:15+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_trig_0102.result

  BitKeeper/deleted/.del-innodb_trig_0102.test~4c86148638150f86@1.2, 2007-07-27 12:58:47+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_trig_0102.test

  BitKeeper/deleted/.del-innodb_trig_03.result~e0001f2ae0594271@1.2, 2007-07-27 12:58:16+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_trig_03.result

  BitKeeper/deleted/.del-innodb_trig_03.test~b90f32a29fd224d6@1.2, 2007-07-27 12:58:48+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_trig_03.test

  BitKeeper/deleted/.del-innodb_trig_0407.result~30a523819cb1dbce@1.2, 2007-07-27 12:58:16+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_trig_0407.result

  BitKeeper/deleted/.del-innodb_trig_0407.test~8b8d01c8c8b107@1.2, 2007-07-27 12:58:48+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_trig_0407.test

  BitKeeper/deleted/.del-innodb_trig_08.result~7fb6bf5750a72547@1.3, 2007-07-27 12:58:16+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_trig_08.result

  BitKeeper/deleted/.del-innodb_trig_08.test~82ea213f59cf5634@1.2, 2007-07-27 12:58:49+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_trig_08.test

  BitKeeper/deleted/.del-innodb_trig_09.result~45bdbd4e78d18c43@1.2, 2007-07-27 12:58:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_trig_09.result

  BitKeeper/deleted/.del-innodb_trig_09.test~1407c2016d589067@1.2, 2007-07-27 12:58:49+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_trig_09.test

  BitKeeper/deleted/.del-innodb_trig_1011ext.result~693d4af717160b0@1.2, 2007-07-27 12:58:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result

  BitKeeper/deleted/.del-innodb_trig_1011ext.test~8f405ef2239bcfed@1.2, 2007-07-27 12:58:50+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test

  BitKeeper/deleted/.del-innodb_trig_frkey.result~f8324099abe39a@1.2, 2007-07-27 12:58:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_trig_frkey.result

  BitKeeper/deleted/.del-innodb_trig_frkey.test~7c1c0af7c80de602@1.2, 2007-07-27 12:58:50+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_trig_frkey.test

  BitKeeper/deleted/.del-innodb_triggers.result~47d4751cc196bab9@1.2, 2007-07-27 12:58:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_triggers.result

  BitKeeper/deleted/.del-innodb_views.result~f6ee0e22cb353b49@1.3, 2007-07-27 12:58:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb_views.result

  BitKeeper/deleted/.del-innodb_views.test~460914b9e63a58f0@1.2, 2007-07-27 12:58:50+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb_views.test

  BitKeeper/deleted/.del-load_sp_tb.inc~874151dac20d4609@1.2, 2007-07-27 12:58:38+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc

  BitKeeper/deleted/.del-memory__datadict.result~49b74301886e1847@1.4, 2007-07-27 12:58:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory__datadict.result

  BitKeeper/deleted/.del-memory__datadict.test~97e67292a3c6ebd0@1.2, 2007-07-27 12:58:51+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory__datadict.test

  BitKeeper/deleted/.del-memory__load.result~e759ae177d135580@1.2, 2007-07-27 12:58:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory__load.result

  BitKeeper/deleted/.del-memory__load.test~a18998091ef9b001@1.2, 2007-07-27 12:58:51+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory__load.test

  BitKeeper/deleted/.del-memory_bitdata.result~cbda7481debfd3d2@1.2, 2007-07-27 12:58:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_bitdata.result

  BitKeeper/deleted/.del-memory_bitdata.test~8c3293caa99e7db2@1.2, 2007-07-27 12:58:52+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_bitdata.test

  BitKeeper/deleted/.del-memory_cursors.result~ff9866fb5dfd7e3a@1.2, 2007-07-27 12:58:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_cursors.result

  BitKeeper/deleted/.del-memory_cursors.test~208b9d3a3b388e5a@1.2, 2007-07-27 12:58:52+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_cursors.test

  BitKeeper/deleted/.del-memory_func_view.result~e552d7de38647c08@1.3, 2007-07-27 12:58:21+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_func_view.result

  BitKeeper/deleted/.del-memory_func_view.test~43ca20a516b29af3@1.2, 2007-07-27 12:58:52+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_func_view.test

  BitKeeper/deleted/.del-memory_storedproc.result~f448dceb2b3c0663@1.2, 2007-07-27 12:58:21+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_storedproc.result

  BitKeeper/deleted/.del-memory_storedproc.test~1b6d3856750b4103@1.2, 2007-07-27 12:58:53+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_storedproc.test

  BitKeeper/deleted/.del-memory_storedproc_02.result~8fe9a1951ddcddb2@1.2, 2007-07-27 12:58:22+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_storedproc_02.result

  BitKeeper/deleted/.del-memory_storedproc_02.test~3d699d9d8cadcec@1.2, 2007-07-27 12:58:53+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_storedproc_02.test

  BitKeeper/deleted/.del-memory_storedproc_03.result~da1a54e7f7fb565c@1.2, 2007-07-27 12:58:22+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_storedproc_03.result

  BitKeeper/deleted/.del-memory_storedproc_03.test~b8e4f73c53d2d65c@1.2, 2007-07-27 12:58:54+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_storedproc_03.test

  BitKeeper/deleted/.del-memory_storedproc_06.result~a2f933a1c033c7a4@1.2, 2007-07-27 12:58:23+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_storedproc_06.result

  BitKeeper/deleted/.del-memory_storedproc_06.test~6f0344325cdc7e47@1.2, 2007-07-27 12:58:54+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_storedproc_06.test

  BitKeeper/deleted/.del-memory_storedproc_07.result~2bc5723a4df61278@1.2, 2007-07-27 12:58:23+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_storedproc_07.result

  BitKeeper/deleted/.del-memory_storedproc_07.test~d72c0c08d46ff3d@1.2, 2007-07-27 12:58:54+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_storedproc_07.test

  BitKeeper/deleted/.del-memory_storedproc_08.result~5e68fabd8a121268@1.2, 2007-07-27 12:58:23+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_storedproc_08.result

  BitKeeper/deleted/.del-memory_storedproc_08.test~abb018786b9c9cc4@1.2, 2007-07-27 12:58:55+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_storedproc_08.test

  BitKeeper/deleted/.del-memory_storedproc_10.result~2eae10df620fed3b@1.2, 2007-07-27 12:58:24+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_storedproc_10.result

  BitKeeper/deleted/.del-memory_storedproc_10.test~235432215fa35be8@1.2, 2007-07-27 12:58:55+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_storedproc_10.test

  BitKeeper/deleted/.del-memory_tb1.inc~26b9bca8492b8ef0@1.2, 2007-07-27 12:58:05+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/memory_tb1.inc

  BitKeeper/deleted/.del-memory_tb1.txt~6132f28bde92b74d@1.2, 2007-07-27 12:57:52+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/data/memory_tb1.txt

  BitKeeper/deleted/.del-memory_tb2.inc~9789d498ce902299@1.2, 2007-07-27 12:58:05+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/memory_tb2.inc

  BitKeeper/deleted/.del-memory_tb2.txt~e989d4cca5cc4383@1.2, 2007-07-27 12:57:52+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/data/memory_tb2.txt

  BitKeeper/deleted/.del-memory_tb3.inc~f68852743e949b69@1.2, 2007-07-27 12:58:05+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/memory_tb3.inc

  BitKeeper/deleted/.del-memory_tb3.txt~41d0c3a6f93c7943@1.2, 2007-07-27 12:57:52+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/data/memory_tb3.txt

  BitKeeper/deleted/.del-memory_tb4.inc~19ec0e6953e071e6@1.2, 2007-07-27 12:58:06+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/memory_tb4.inc

  BitKeeper/deleted/.del-memory_tb4.txt~c2e1ba0cb221343c@1.2, 2007-07-27 12:57:53+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/data/memory_tb4.txt

  BitKeeper/deleted/.del-memory_trig_0102.result~6ddf339f2d5523c6@1.3, 2007-07-27 12:58:25+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_trig_0102.result

  BitKeeper/deleted/.del-memory_trig_0102.test~14bcf15df5764973@1.2, 2007-07-27 12:58:56+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_trig_0102.test

  BitKeeper/deleted/.del-memory_trig_03.result~843e1e88cec532e7@1.2, 2007-07-27 12:58:25+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_trig_03.result

  BitKeeper/deleted/.del-memory_trig_03.test~27016478f8698755@1.2, 2007-07-27 12:58:56+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_trig_03.test

  BitKeeper/deleted/.del-memory_trig_0407.result~a561a80e40cd820a@1.2, 2007-07-27 12:58:25+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_trig_0407.result

  BitKeeper/deleted/.del-memory_trig_0407.test~519fa098e2e89a49@1.2, 2007-07-27 12:58:57+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_trig_0407.test

  BitKeeper/deleted/.del-memory_trig_08.result~3a5fc5dba5ab1378@1.3, 2007-07-27 12:58:26+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_trig_08.result

  BitKeeper/deleted/.del-memory_trig_08.test~eb12b11ef9e956ca@1.2, 2007-07-27 12:58:57+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_trig_08.test

  BitKeeper/deleted/.del-memory_trig_09.result~f54649a13258f1f9@1.2, 2007-07-27 12:58:26+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_trig_09.result

  BitKeeper/deleted/.del-memory_trig_09.test~f53b89eced332954@1.2, 2007-07-27 12:58:57+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_trig_09.test

  BitKeeper/deleted/.del-memory_trig_1011ext.result~58022c2cc6d43a43@1.2, 2007-07-27 12:58:27+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_trig_1011ext.result

  BitKeeper/deleted/.del-memory_trig_1011ext.test~b090a0fc7f12ab08@1.2, 2007-07-27 12:58:58+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_trig_1011ext.test

  BitKeeper/deleted/.del-memory_triggers.result~4720213a17bd1f8b@1.2, 2007-07-27 12:58:27+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_triggers.result

  BitKeeper/deleted/.del-memory_views.result~d600cc46b350d191@1.3, 2007-07-27 12:58:28+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory_views.result

  BitKeeper/deleted/.del-memory_views.test~91ffafb774f67137@1.2, 2007-07-27 12:58:58+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory_views.test

  BitKeeper/deleted/.del-myisam__datadict.result~84fd7948204f0fcf@1.4, 2007-07-27 12:58:28+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam__datadict.result

  BitKeeper/deleted/.del-myisam__datadict.test~cae9a60de78fc35d@1.2, 2007-07-27 12:58:59+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam__datadict.test

  BitKeeper/deleted/.del-myisam__load.result~a5cdfae657f4420a@1.2, 2007-07-27 12:58:29+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam__load.result

  BitKeeper/deleted/.del-myisam__load.test~475638485078225c@1.2, 2007-07-27 12:58:59+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam__load.test

  BitKeeper/deleted/.del-myisam_bitdata.result~58a8f4201386a085@1.2, 2007-07-27 12:58:29+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_bitdata.result

  BitKeeper/deleted/.del-myisam_bitdata.test~12a510e9660ace8b@1.2, 2007-07-27 12:58:59+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_bitdata.test

  BitKeeper/deleted/.del-myisam_cursors.result~49d90d672526a743@1.2, 2007-07-27 12:58:30+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_cursors.result

  BitKeeper/deleted/.del-myisam_cursors.test~e14ab9d55d14f27b@1.2, 2007-07-27 12:59:00+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_cursors.test

  BitKeeper/deleted/.del-myisam_func_view.result~534db497d89b6db8@1.3, 2007-07-27 12:58:30+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_func_view.result

  BitKeeper/deleted/.del-myisam_func_view.test~1e272349f93f83f2@1.2, 2007-07-27 12:59:00+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_func_view.test

  BitKeeper/deleted/.del-myisam_storedproc.result~11afaec1d6691272@1.2, 2007-07-27 12:58:31+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_storedproc.result

  BitKeeper/deleted/.del-myisam_storedproc.test~2ba6363d2e1a3c34@1.2, 2007-07-27 12:59:01+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_storedproc.test

  BitKeeper/deleted/.del-myisam_storedproc_02.result~da54080b38b800e1@1.2, 2007-07-27 12:58:31+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_02.result

  BitKeeper/deleted/.del-myisam_storedproc_02.test~3baa154a9e7da1f9@1.2, 2007-07-27 12:59:01+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_02.test

  BitKeeper/deleted/.del-myisam_storedproc_03.result~f43705b213fa0be7@1.2, 2007-07-27 12:58:31+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_03.result

  BitKeeper/deleted/.del-myisam_storedproc_03.test~b6ca96ed3dfbe37f@1.2, 2007-07-27 12:59:02+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_03.test

  BitKeeper/deleted/.del-myisam_storedproc_06.result~82bc7661134f9251@1.2, 2007-07-27 12:58:32+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_06.result

  BitKeeper/deleted/.del-myisam_storedproc_06.test~a4150b544475b75@1.2, 2007-07-27 12:59:02+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_06.test

  BitKeeper/deleted/.del-myisam_storedproc_07.result~43793b065606447@1.2, 2007-07-27 12:58:32+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_07.result

  BitKeeper/deleted/.del-myisam_storedproc_07.test~618a6a50ec4ad67e@1.2, 2007-07-27 12:59:02+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_07.test

  BitKeeper/deleted/.del-myisam_storedproc_08.result~a41f1829cf91919d@1.2, 2007-07-27 12:58:33+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_08.result

  BitKeeper/deleted/.del-myisam_storedproc_08.test~84a1b27da7087d9@1.2, 2007-07-27 12:59:03+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_08.test

  BitKeeper/deleted/.del-myisam_storedproc_10.result~601f1f3b7ff82de6@1.2, 2007-07-27 12:58:33+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_10.result

  BitKeeper/deleted/.del-myisam_storedproc_10.test~488ef8f94b0e21bd@1.2, 2007-07-27 12:59:03+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_10.test

  BitKeeper/deleted/.del-myisam_tb1.inc~9f4487705fda1b27@1.2, 2007-07-27 12:58:06+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/myisam_tb1.inc

  BitKeeper/deleted/.del-myisam_tb1.txt~7f1338ea22ef2ddd@1.2, 2007-07-27 12:57:53+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/data/myisam_tb1.txt

  BitKeeper/deleted/.del-myisam_tb2.inc~5433401ca94057c3@1.2, 2007-07-27 12:58:07+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/myisam_tb2.inc

  BitKeeper/deleted/.del-myisam_tb2.txt~274fcaf6c68cd806@1.2, 2007-07-27 12:57:54+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/data/myisam_tb2.txt

  BitKeeper/deleted/.del-myisam_tb3.inc~8056471332f80a19@1.2, 2007-07-27 12:58:07+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/myisam_tb3.inc

  BitKeeper/deleted/.del-myisam_tb3.txt~79980a26498bc43@1.2, 2007-07-27 12:57:54+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/data/myisam_tb3.txt

  BitKeeper/deleted/.del-myisam_tb4.inc~5e51596cea151c88@1.2, 2007-07-27 12:58:07+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/myisam_tb4.inc

  BitKeeper/deleted/.del-myisam_tb4.txt~f6911545af0083a1@1.2, 2007-07-27 12:57:54+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/data/myisam_tb4.txt

  BitKeeper/deleted/.del-myisam_trig_0102.result~aa3d68a52b9d9461@1.3, 2007-07-27 12:58:34+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_trig_0102.result

  BitKeeper/deleted/.del-myisam_trig_0102.test~ba6337bfcf06720f@1.2, 2007-07-27 12:59:04+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_trig_0102.test

  BitKeeper/deleted/.del-myisam_trig_03.result~a958349fc6dbafc4@1.2, 2007-07-27 12:58:34+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_trig_03.result

  BitKeeper/deleted/.del-myisam_trig_03.test~26c97fd2347ce5a5@1.2, 2007-07-27 12:59:04+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_trig_03.test

  BitKeeper/deleted/.del-myisam_trig_0407.result~ff5d0269d6f069ac@1.2, 2007-07-27 12:58:35+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_trig_0407.result

  BitKeeper/deleted/.del-myisam_trig_0407.test~bf799febfd188363@1.2, 2007-07-27 12:59:04+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_trig_0407.test

  BitKeeper/deleted/.del-myisam_trig_08.result~b116c6baef5c9329@1.3, 2007-07-27 12:58:35+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_trig_08.result

  BitKeeper/deleted/.del-myisam_trig_08.test~9dd03c9fb189a2d0@1.2, 2007-07-27 12:59:05+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_trig_08.test

  BitKeeper/deleted/.del-myisam_trig_09.result~f5e5181e4de57aa2@1.2, 2007-07-27 12:58:35+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_trig_09.result

  BitKeeper/deleted/.del-myisam_trig_09.test~4706099520d9fcff@1.2, 2007-07-27 12:59:05+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_trig_09.test

  BitKeeper/deleted/.del-myisam_trig_1011ext.result~188c33cf34d15c28@1.2, 2007-07-27 12:58:36+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result

  BitKeeper/deleted/.del-myisam_trig_1011ext.test~33947cfdce83359f@1.2, 2007-07-27 12:59:06+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test

  BitKeeper/deleted/.del-myisam_triggers.result~5d09cc9a6e725ae0@1.2, 2007-07-27 12:58:36+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_triggers.result

  BitKeeper/deleted/.del-myisam_views.result~3f58b2463d68e870@1.3, 2007-07-27 12:58:37+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam_views.result

  BitKeeper/deleted/.del-myisam_views.test~8191b1664f3fb073@1.2, 2007-07-27 12:59:06+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam_views.test

  BitKeeper/deleted/.del-show_connection.inc~e779f70c38f084c6@1.2, 2007-07-27 12:58:08+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/show_connection.inc

  BitKeeper/deleted/.del-sp_tb.inc~68c5d8cee47a7ebc@1.2, 2007-07-27 12:58:08+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/include/sp_tb.inc

  BitKeeper/deleted/.del-storedproc_02.inc~382fa05b78862c2d@1.2, 2007-07-27 12:58:38+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/storedproc/storedproc_02.inc

  BitKeeper/deleted/.del-storedproc_03.inc~950bd5f0df49c0c0@1.2, 2007-07-27 12:58:39+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/storedproc/storedproc_03.inc

  BitKeeper/deleted/.del-storedproc_06.inc~3313ca46f891a104@1.2, 2007-07-27 12:58:39+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/storedproc/storedproc_06.inc

  BitKeeper/deleted/.del-storedproc_07.inc~8af2431ad7ef6a1@1.2, 2007-07-27 12:58:40+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/storedproc/storedproc_07.inc

  BitKeeper/deleted/.del-storedproc_08.inc~e2730281eff07089@1.2, 2007-07-27 12:58:40+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/storedproc/storedproc_08.inc

  BitKeeper/deleted/.del-storedproc_08_show.inc~756c67bd3b7d61f8@1.2, 2007-07-27 12:58:40+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc

  BitKeeper/deleted/.del-storedproc_10.inc~9b2eecdca3bc87e0@1.2, 2007-07-27 12:58:41+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/storedproc/storedproc_10.inc

  BitKeeper/deleted/.del-storedproc_master.inc~d06ed09343243344@1.2, 2007-07-27 12:58:41+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/storedproc/storedproc_master.inc

  BitKeeper/deleted/.del-t3.txt~6ae31465f2e71150@1.2, 2007-07-27 12:57:55+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/data/t3.txt

  BitKeeper/deleted/.del-t4.txt~ea4aa3bb29a89198@1.2, 2007-07-27 12:57:55+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/data/t4.txt

  BitKeeper/deleted/.del-t7.txt~eede0d702e02d5bf@1.2, 2007-07-27 12:57:56+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/data/t7.txt

  BitKeeper/deleted/.del-t9.txt~3df18021c8994cfa@1.2, 2007-07-27 12:57:56+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/data/t9.txt

  BitKeeper/deleted/.del-trig_frkey.inc~ddc32f51b7efc8a7@1.2, 2007-07-27 12:59:07+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/triggers/trig_frkey.inc

  BitKeeper/deleted/.del-trig_frkey2.inc~6e45874f67bff63f@1.2, 2007-07-27 12:59:07+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/triggers/trig_frkey2.inc

  BitKeeper/deleted/.del-triggers_0102.inc~3e3628c21eb1b6b3@1.3, 2007-07-27 12:59:07+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/triggers/triggers_0102.inc

  BitKeeper/deleted/.del-triggers_03.inc~952da03e2aa2e366@1.2, 2007-07-27 12:59:08+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/triggers/triggers_03.inc

  BitKeeper/deleted/.del-triggers_0407.inc~26d5f499dcbba3dd@1.2, 2007-07-27 12:59:08+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/triggers/triggers_0407.inc

  BitKeeper/deleted/.del-triggers_08.inc~23ce6806b152b7fc@1.2, 2007-07-27 12:59:09+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/triggers/triggers_08.inc

  BitKeeper/deleted/.del-triggers_09.inc~77f09e3677536d9f@1.2, 2007-07-27 12:59:09+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/triggers/triggers_09.inc

  BitKeeper/deleted/.del-triggers_1011ext.inc~ed096947fb03693@1.2, 2007-07-27 12:59:10+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc

  BitKeeper/deleted/.del-triggers_master.test~fc19575e956a0b72@1.2, 2007-07-27 12:59:10+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/triggers/triggers_master.test

  BitKeeper/deleted/.del-views_master.inc~2d2a52a68d0d77fd@1.4, 2007-07-27 12:59:13+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/funcs_1/views/views_master.inc

  mysql-test/suite/funcs_1/README.txt@1.4, 2007-07-27 12:59:14+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-README.txt-renamed -> mysql-test/suite/funcs_1/README.txt

  mysql-test/suite/funcs_1/bitdata/bitdata_master.test@1.3, 2007-07-27 12:57:49+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-bitdata_master.test -> mysql-test/suite/funcs_1/bitdata/bitdata_master.test

  mysql-test/suite/funcs_1/cursors/cursors_master.test@1.3, 2007-07-27 12:57:50+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-cursors_master.test -> mysql-test/suite/funcs_1/cursors/cursors_master.test

  mysql-test/suite/funcs_1/data/innodb_tb1.txt@1.3, 2007-07-27 12:57:50+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_tb1.txt -> mysql-test/suite/funcs_1/data/innodb_tb1.txt

  mysql-test/suite/funcs_1/data/innodb_tb2.txt@1.3, 2007-07-27 12:57:50+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_tb2.txt -> mysql-test/suite/funcs_1/data/innodb_tb2.txt

  mysql-test/suite/funcs_1/data/innodb_tb3.txt@1.3, 2007-07-27 12:57:51+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_tb3.txt -> mysql-test/suite/funcs_1/data/innodb_tb3.txt

  mysql-test/suite/funcs_1/data/innodb_tb4.txt@1.3, 2007-07-27 12:57:51+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_tb4.txt -> mysql-test/suite/funcs_1/data/innodb_tb4.txt

  mysql-test/suite/funcs_1/data/memory_tb1.txt@1.3, 2007-07-27 12:57:52+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_tb1.txt -> mysql-test/suite/funcs_1/data/memory_tb1.txt

  mysql-test/suite/funcs_1/data/memory_tb2.txt@1.3, 2007-07-27 12:57:52+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_tb2.txt -> mysql-test/suite/funcs_1/data/memory_tb2.txt

  mysql-test/suite/funcs_1/data/memory_tb3.txt@1.3, 2007-07-27 12:57:52+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_tb3.txt -> mysql-test/suite/funcs_1/data/memory_tb3.txt

  mysql-test/suite/funcs_1/data/memory_tb4.txt@1.3, 2007-07-27 12:57:53+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_tb4.txt -> mysql-test/suite/funcs_1/data/memory_tb4.txt

  mysql-test/suite/funcs_1/data/myisam_tb1.txt@1.3, 2007-07-27 12:57:53+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_tb1.txt -> mysql-test/suite/funcs_1/data/myisam_tb1.txt

  mysql-test/suite/funcs_1/data/myisam_tb2.txt@1.3, 2007-07-27 12:57:54+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_tb2.txt -> mysql-test/suite/funcs_1/data/myisam_tb2.txt

  mysql-test/suite/funcs_1/data/myisam_tb3.txt@1.3, 2007-07-27 12:57:54+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_tb3.txt -> mysql-test/suite/funcs_1/data/myisam_tb3.txt

  mysql-test/suite/funcs_1/data/myisam_tb4.txt@1.3, 2007-07-27 12:57:55+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_tb4.txt -> mysql-test/suite/funcs_1/data/myisam_tb4.txt

  mysql-test/suite/funcs_1/data/t3.txt@1.3, 2007-07-27 12:57:55+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-t3.txt -> mysql-test/suite/funcs_1/data/t3.txt

  mysql-test/suite/funcs_1/data/t4.txt@1.3, 2007-07-27 12:57:55+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-t4.txt -> mysql-test/suite/funcs_1/data/t4.txt

  mysql-test/suite/funcs_1/data/t7.txt@1.3, 2007-07-27 12:57:56+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-t7.txt -> mysql-test/suite/funcs_1/data/t7.txt

  mysql-test/suite/funcs_1/data/t9.txt@1.3, 2007-07-27 12:57:56+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-t9.txt -> mysql-test/suite/funcs_1/data/t9.txt

  mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc@1.3, 2007-07-27 12:57:57+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-datadict_bug_12777.inc -> mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc

  mysql-test/suite/funcs_1/datadict/datadict_load.inc@1.4, 2007-07-27 12:57:57+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-datadict_load.inc -> mysql-test/suite/funcs_1/datadict/datadict_load.inc

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@1.4, 2007-07-27 12:57:57+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-datadict_master.inc -> mysql-test/suite/funcs_1/datadict/datadict_master.inc

  mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc@1.4, 2007-07-27 12:57:58+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-datadict_show_schema.inc -> mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc

  mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc@1.3, 2007-07-27 12:57:58+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-datadict_show_table_design.inc -> mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc

  mysql-test/suite/funcs_1/datadict/datadict_tables.inc@1.3, 2007-07-27 12:57:59+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-datadict_tables.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables.inc

  mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc@1.3, 2007-07-27 12:57:59+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-datadict_tables_error.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc@1.3, 2007-07-27 12:58:00+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-datadict_tables_error_1.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc@1.3, 2007-07-27 12:58:00+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-datadict_tables_error_1044.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc@1.3, 2007-07-27 12:58:00+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-datadict_tables_error_1049.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc@1.3, 2007-07-27 12:58:01+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-datadict_tables_error_1051.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc@1.3, 2007-07-27 12:58:01+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-datadict_tables_error_1146.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc@1.3, 2007-07-27 12:58:02+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-datadict_tables_error_1288.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc

  mysql-test/suite/funcs_1/include/create_database.inc@1.3, 2007-07-27 12:58:02+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-create_database.inc -> mysql-test/suite/funcs_1/include/create_database.inc

  mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc@1.3, 2007-07-27 12:58:02+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-create_user_lowest_priv.inc -> mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc

  mysql-test/suite/funcs_1/include/create_user_no_super.inc@1.3, 2007-07-27 12:58:03+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-create_user_no_super.inc -> mysql-test/suite/funcs_1/include/create_user_no_super.inc

  mysql-test/suite/funcs_1/include/innodb_tb1.inc@1.3, 2007-07-27 12:58:03+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_tb1.inc -> mysql-test/suite/funcs_1/include/innodb_tb1.inc

  mysql-test/suite/funcs_1/include/innodb_tb2.inc@1.3, 2007-07-27 12:58:04+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_tb2.inc -> mysql-test/suite/funcs_1/include/innodb_tb2.inc

  mysql-test/suite/funcs_1/include/innodb_tb3.inc@1.3, 2007-07-27 12:58:04+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_tb3.inc -> mysql-test/suite/funcs_1/include/innodb_tb3.inc

  mysql-test/suite/funcs_1/include/innodb_tb4.inc@1.3, 2007-07-27 12:58:04+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_tb4.inc -> mysql-test/suite/funcs_1/include/innodb_tb4.inc

  mysql-test/suite/funcs_1/include/memory_tb1.inc@1.3, 2007-07-27 12:58:05+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_tb1.inc -> mysql-test/suite/funcs_1/include/memory_tb1.inc

  mysql-test/suite/funcs_1/include/memory_tb2.inc@1.3, 2007-07-27 12:58:05+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_tb2.inc -> mysql-test/suite/funcs_1/include/memory_tb2.inc

  mysql-test/suite/funcs_1/include/memory_tb3.inc@1.3, 2007-07-27 12:58:06+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_tb3.inc -> mysql-test/suite/funcs_1/include/memory_tb3.inc

  mysql-test/suite/funcs_1/include/memory_tb4.inc@1.3, 2007-07-27 12:58:06+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_tb4.inc -> mysql-test/suite/funcs_1/include/memory_tb4.inc

  mysql-test/suite/funcs_1/include/myisam_tb1.inc@1.3, 2007-07-27 12:58:06+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_tb1.inc -> mysql-test/suite/funcs_1/include/myisam_tb1.inc

  mysql-test/suite/funcs_1/include/myisam_tb2.inc@1.3, 2007-07-27 12:58:07+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_tb2.inc -> mysql-test/suite/funcs_1/include/myisam_tb2.inc

  mysql-test/suite/funcs_1/include/myisam_tb3.inc@1.3, 2007-07-27 12:58:07+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_tb3.inc -> mysql-test/suite/funcs_1/include/myisam_tb3.inc

  mysql-test/suite/funcs_1/include/myisam_tb4.inc@1.3, 2007-07-27 12:58:08+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_tb4.inc -> mysql-test/suite/funcs_1/include/myisam_tb4.inc

  mysql-test/suite/funcs_1/include/show_connection.inc@1.3, 2007-07-27 12:58:08+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-show_connection.inc -> mysql-test/suite/funcs_1/include/show_connection.inc

  mysql-test/suite/funcs_1/include/sp_tb.inc@1.3, 2007-07-27 12:58:09+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-sp_tb.inc -> mysql-test/suite/funcs_1/include/sp_tb.inc

  mysql-test/suite/funcs_1/lib/DataGen_local.pl@1.3, 2007-07-27 12:58:09+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-DataGen_local.pl -> mysql-test/suite/funcs_1/lib/DataGen_local.pl

  mysql-test/suite/funcs_1/lib/DataGen_modify.pl@1.3, 2007-07-27 12:58:09+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-DataGen_modify.pl -> mysql-test/suite/funcs_1/lib/DataGen_modify.pl

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.4, 2007-07-27 12:58:10+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb__datadict.result -> mysql-test/suite/funcs_1/r/innodb__datadict.result

  mysql-test/suite/funcs_1/r/innodb__load.result@1.3, 2007-07-27 12:58:10+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb__load.result -> mysql-test/suite/funcs_1/r/innodb__load.result

  mysql-test/suite/funcs_1/r/innodb_bitdata.result@1.3, 2007-07-27 12:58:11+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_bitdata.result -> mysql-test/suite/funcs_1/r/innodb_bitdata.result

  mysql-test/suite/funcs_1/r/innodb_cursors.result@1.3, 2007-07-27 12:58:11+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_cursors.result -> mysql-test/suite/funcs_1/r/innodb_cursors.result

  mysql-test/suite/funcs_1/r/innodb_func_view.result@1.4, 2007-07-27 12:58:12+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_func_view.result -> mysql-test/suite/funcs_1/r/innodb_func_view.result

  mysql-test/suite/funcs_1/r/innodb_storedproc.result@1.3, 2007-07-27 12:58:12+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_storedproc.result -> mysql-test/suite/funcs_1/r/innodb_storedproc.result

  mysql-test/suite/funcs_1/r/innodb_storedproc_02.result@1.3, 2007-07-27 12:58:13+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_storedproc_02.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_02.result

  mysql-test/suite/funcs_1/r/innodb_storedproc_03.result@1.3, 2007-07-27 12:58:13+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_storedproc_03.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_03.result

  mysql-test/suite/funcs_1/r/innodb_storedproc_06.result@1.3, 2007-07-27 12:58:13+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_storedproc_06.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_06.result

  mysql-test/suite/funcs_1/r/innodb_storedproc_07.result@1.3, 2007-07-27 12:58:14+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_storedproc_07.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_07.result

  mysql-test/suite/funcs_1/r/innodb_storedproc_08.result@1.3, 2007-07-27 12:58:15+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_storedproc_08.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_08.result

  mysql-test/suite/funcs_1/r/innodb_storedproc_10.result@1.3, 2007-07-27 12:58:15+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_storedproc_10.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_10.result

  mysql-test/suite/funcs_1/r/innodb_trig_0102.result@1.3, 2007-07-27 12:58:15+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_trig_0102.result -> mysql-test/suite/funcs_1/r/innodb_trig_0102.result

  mysql-test/suite/funcs_1/r/innodb_trig_03.result@1.3, 2007-07-27 12:58:16+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_trig_03.result -> mysql-test/suite/funcs_1/r/innodb_trig_03.result

  mysql-test/suite/funcs_1/r/innodb_trig_0407.result@1.3, 2007-07-27 12:58:16+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_trig_0407.result -> mysql-test/suite/funcs_1/r/innodb_trig_0407.result

  mysql-test/suite/funcs_1/r/innodb_trig_08.result@1.4, 2007-07-27 12:58:17+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_trig_08.result -> mysql-test/suite/funcs_1/r/innodb_trig_08.result

  mysql-test/suite/funcs_1/r/innodb_trig_09.result@1.3, 2007-07-27 12:58:17+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_trig_09.result -> mysql-test/suite/funcs_1/r/innodb_trig_09.result

  mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result@1.3, 2007-07-27 12:58:17+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_trig_1011ext.result -> mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result

  mysql-test/suite/funcs_1/r/innodb_trig_frkey.result@1.3, 2007-07-27 12:58:18+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_trig_frkey.result -> mysql-test/suite/funcs_1/r/innodb_trig_frkey.result

  mysql-test/suite/funcs_1/r/innodb_triggers.result@1.3, 2007-07-27 12:58:18+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_triggers.result -> mysql-test/suite/funcs_1/r/innodb_triggers.result

  mysql-test/suite/funcs_1/r/innodb_views.result@1.4, 2007-07-27 12:58:19+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_views.result -> mysql-test/suite/funcs_1/r/innodb_views.result

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.4, 2007-07-27 12:58:19+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory__datadict.result -> mysql-test/suite/funcs_1/r/memory__datadict.result

  mysql-test/suite/funcs_1/r/memory__load.result@1.3, 2007-07-27 12:58:20+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory__load.result -> mysql-test/suite/funcs_1/r/memory__load.result

  mysql-test/suite/funcs_1/r/memory_bitdata.result@1.3, 2007-07-27 12:58:20+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_bitdata.result -> mysql-test/suite/funcs_1/r/memory_bitdata.result

  mysql-test/suite/funcs_1/r/memory_cursors.result@1.3, 2007-07-27 12:58:20+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_cursors.result -> mysql-test/suite/funcs_1/r/memory_cursors.result

  mysql-test/suite/funcs_1/r/memory_func_view.result@1.4, 2007-07-27 12:58:21+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_func_view.result -> mysql-test/suite/funcs_1/r/memory_func_view.result

  mysql-test/suite/funcs_1/r/memory_storedproc.result@1.3, 2007-07-27 12:58:21+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_storedproc.result -> mysql-test/suite/funcs_1/r/memory_storedproc.result

  mysql-test/suite/funcs_1/r/memory_storedproc_02.result@1.3, 2007-07-27 12:58:22+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_storedproc_02.result -> mysql-test/suite/funcs_1/r/memory_storedproc_02.result

  mysql-test/suite/funcs_1/r/memory_storedproc_03.result@1.3, 2007-07-27 12:58:22+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_storedproc_03.result -> mysql-test/suite/funcs_1/r/memory_storedproc_03.result

  mysql-test/suite/funcs_1/r/memory_storedproc_06.result@1.3, 2007-07-27 12:58:23+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_storedproc_06.result -> mysql-test/suite/funcs_1/r/memory_storedproc_06.result

  mysql-test/suite/funcs_1/r/memory_storedproc_07.result@1.3, 2007-07-27 12:58:23+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_storedproc_07.result -> mysql-test/suite/funcs_1/r/memory_storedproc_07.result

  mysql-test/suite/funcs_1/r/memory_storedproc_08.result@1.3, 2007-07-27 12:58:24+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_storedproc_08.result -> mysql-test/suite/funcs_1/r/memory_storedproc_08.result

  mysql-test/suite/funcs_1/r/memory_storedproc_10.result@1.3, 2007-07-27 12:58:24+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_storedproc_10.result -> mysql-test/suite/funcs_1/r/memory_storedproc_10.result

  mysql-test/suite/funcs_1/r/memory_trig_0102.result@1.3, 2007-07-27 12:58:25+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_trig_0102.result -> mysql-test/suite/funcs_1/r/memory_trig_0102.result

  mysql-test/suite/funcs_1/r/memory_trig_03.result@1.3, 2007-07-27 12:58:25+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_trig_03.result -> mysql-test/suite/funcs_1/r/memory_trig_03.result

  mysql-test/suite/funcs_1/r/memory_trig_0407.result@1.3, 2007-07-27 12:58:26+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_trig_0407.result -> mysql-test/suite/funcs_1/r/memory_trig_0407.result

  mysql-test/suite/funcs_1/r/memory_trig_08.result@1.4, 2007-07-27 12:58:26+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_trig_08.result -> mysql-test/suite/funcs_1/r/memory_trig_08.result

  mysql-test/suite/funcs_1/r/memory_trig_09.result@1.3, 2007-07-27 12:58:26+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_trig_09.result -> mysql-test/suite/funcs_1/r/memory_trig_09.result

  mysql-test/suite/funcs_1/r/memory_trig_1011ext.result@1.3, 2007-07-27 12:58:27+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_trig_1011ext.result -> mysql-test/suite/funcs_1/r/memory_trig_1011ext.result

  mysql-test/suite/funcs_1/r/memory_triggers.result@1.3, 2007-07-27 12:58:27+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_triggers.result -> mysql-test/suite/funcs_1/r/memory_triggers.result

  mysql-test/suite/funcs_1/r/memory_views.result@1.4, 2007-07-27 12:58:28+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_views.result -> mysql-test/suite/funcs_1/r/memory_views.result

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.4, 2007-07-27 12:58:28+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam__datadict.result -> mysql-test/suite/funcs_1/r/myisam__datadict.result

  mysql-test/suite/funcs_1/r/myisam__load.result@1.3, 2007-07-27 12:58:29+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam__load.result -> mysql-test/suite/funcs_1/r/myisam__load.result

  mysql-test/suite/funcs_1/r/myisam_bitdata.result@1.3, 2007-07-27 12:58:29+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_bitdata.result -> mysql-test/suite/funcs_1/r/myisam_bitdata.result

  mysql-test/suite/funcs_1/r/myisam_cursors.result@1.3, 2007-07-27 12:58:30+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_cursors.result -> mysql-test/suite/funcs_1/r/myisam_cursors.result

  mysql-test/suite/funcs_1/r/myisam_func_view.result@1.4, 2007-07-27 12:58:30+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_func_view.result -> mysql-test/suite/funcs_1/r/myisam_func_view.result

  mysql-test/suite/funcs_1/r/myisam_storedproc.result@1.3, 2007-07-27 12:58:31+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_storedproc.result -> mysql-test/suite/funcs_1/r/myisam_storedproc.result

  mysql-test/suite/funcs_1/r/myisam_storedproc_02.result@1.3, 2007-07-27 12:58:31+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_storedproc_02.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_02.result

  mysql-test/suite/funcs_1/r/myisam_storedproc_03.result@1.3, 2007-07-27 12:58:32+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_storedproc_03.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_03.result

  mysql-test/suite/funcs_1/r/myisam_storedproc_06.result@1.3, 2007-07-27 12:58:32+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_storedproc_06.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_06.result

  mysql-test/suite/funcs_1/r/myisam_storedproc_07.result@1.3, 2007-07-27 12:58:32+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_storedproc_07.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_07.result

  mysql-test/suite/funcs_1/r/myisam_storedproc_08.result@1.3, 2007-07-27 12:58:33+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_storedproc_08.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_08.result

  mysql-test/suite/funcs_1/r/myisam_storedproc_10.result@1.3, 2007-07-27 12:58:33+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_storedproc_10.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_10.result

  mysql-test/suite/funcs_1/r/myisam_trig_0102.result@1.3, 2007-07-27 12:58:34+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_trig_0102.result -> mysql-test/suite/funcs_1/r/myisam_trig_0102.result

  mysql-test/suite/funcs_1/r/myisam_trig_03.result@1.3, 2007-07-27 12:58:34+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_trig_03.result -> mysql-test/suite/funcs_1/r/myisam_trig_03.result

  mysql-test/suite/funcs_1/r/myisam_trig_0407.result@1.3, 2007-07-27 12:58:35+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_trig_0407.result -> mysql-test/suite/funcs_1/r/myisam_trig_0407.result

  mysql-test/suite/funcs_1/r/myisam_trig_08.result@1.4, 2007-07-27 12:58:35+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_trig_08.result -> mysql-test/suite/funcs_1/r/myisam_trig_08.result

  mysql-test/suite/funcs_1/r/myisam_trig_09.result@1.3, 2007-07-27 12:58:36+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_trig_09.result -> mysql-test/suite/funcs_1/r/myisam_trig_09.result

  mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result@1.3, 2007-07-27 12:58:36+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_trig_1011ext.result -> mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result

  mysql-test/suite/funcs_1/r/myisam_triggers.result@1.3, 2007-07-27 12:58:37+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_triggers.result -> mysql-test/suite/funcs_1/r/myisam_triggers.result

  mysql-test/suite/funcs_1/r/myisam_views.result@1.4, 2007-07-27 12:58:37+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_views.result -> mysql-test/suite/funcs_1/r/myisam_views.result

  mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc@1.3, 2007-07-27 12:58:37+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-cleanup_sp_tb.inc -> mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc

  mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc@1.3, 2007-07-27 12:58:38+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-load_sp_tb.inc -> mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc

  mysql-test/suite/funcs_1/storedproc/storedproc_02.inc@1.3, 2007-07-27 12:58:38+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-storedproc_02.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_02.inc

  mysql-test/suite/funcs_1/storedproc/storedproc_03.inc@1.3, 2007-07-27 12:58:39+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-storedproc_03.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_03.inc

  mysql-test/suite/funcs_1/storedproc/storedproc_06.inc@1.3, 2007-07-27 12:58:39+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-storedproc_06.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_06.inc

  mysql-test/suite/funcs_1/storedproc/storedproc_07.inc@1.3, 2007-07-27 12:58:40+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-storedproc_07.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_07.inc

  mysql-test/suite/funcs_1/storedproc/storedproc_08.inc@1.3, 2007-07-27 12:58:40+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-storedproc_08.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_08.inc

  mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc@1.3, 2007-07-27 12:58:41+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-storedproc_08_show.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc

  mysql-test/suite/funcs_1/storedproc/storedproc_10.inc@1.3, 2007-07-27 12:58:41+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-storedproc_10.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_10.inc

  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc@1.3, 2007-07-27 12:58:42+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-storedproc_master.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_master.inc

  mysql-test/suite/funcs_1/t/disabled.def@1.4, 2007-07-27 12:58:42+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-disabled.def~1 -> mysql-test/suite/funcs_1/t/disabled.def

  mysql-test/suite/funcs_1/t/innodb__datadict.test@1.3, 2007-07-27 12:58:42+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb__datadict.test -> mysql-test/suite/funcs_1/t/innodb__datadict.test

  mysql-test/suite/funcs_1/t/innodb__load.test@1.3, 2007-07-27 12:58:43+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb__load.test -> mysql-test/suite/funcs_1/t/innodb__load.test

  mysql-test/suite/funcs_1/t/innodb_bitdata.test@1.3, 2007-07-27 12:58:43+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_bitdata.test -> mysql-test/suite/funcs_1/t/innodb_bitdata.test

  mysql-test/suite/funcs_1/t/innodb_cursors.test@1.3, 2007-07-27 12:58:44+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_cursors.test -> mysql-test/suite/funcs_1/t/innodb_cursors.test

  mysql-test/suite/funcs_1/t/innodb_func_view.test@1.3, 2007-07-27 12:58:44+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_func_view.test -> mysql-test/suite/funcs_1/t/innodb_func_view.test

  mysql-test/suite/funcs_1/t/innodb_storedproc.test@1.3, 2007-07-27 12:58:45+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_storedproc.test -> mysql-test/suite/funcs_1/t/innodb_storedproc.test

  mysql-test/suite/funcs_1/t/innodb_storedproc_02.test@1.3, 2007-07-27 12:58:45+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_storedproc_02.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_02.test

  mysql-test/suite/funcs_1/t/innodb_storedproc_03.test@1.3, 2007-07-27 12:58:46+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_storedproc_03.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_03.test

  mysql-test/suite/funcs_1/t/innodb_storedproc_06.test@1.3, 2007-07-27 12:58:46+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_storedproc_06.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_06.test

  mysql-test/suite/funcs_1/t/innodb_storedproc_07.test@1.3, 2007-07-27 12:58:46+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_storedproc_07.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_07.test

  mysql-test/suite/funcs_1/t/innodb_storedproc_08.test@1.3, 2007-07-27 12:58:47+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_storedproc_08.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_08.test

  mysql-test/suite/funcs_1/t/innodb_storedproc_10.test@1.3, 2007-07-27 12:58:47+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_storedproc_10.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_10.test

  mysql-test/suite/funcs_1/t/innodb_trig_0102.test@1.3, 2007-07-27 12:58:48+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_trig_0102.test -> mysql-test/suite/funcs_1/t/innodb_trig_0102.test

  mysql-test/suite/funcs_1/t/innodb_trig_03.test@1.3, 2007-07-27 12:58:48+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_trig_03.test -> mysql-test/suite/funcs_1/t/innodb_trig_03.test

  mysql-test/suite/funcs_1/t/innodb_trig_0407.test@1.3, 2007-07-27 12:58:48+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_trig_0407.test -> mysql-test/suite/funcs_1/t/innodb_trig_0407.test

  mysql-test/suite/funcs_1/t/innodb_trig_08.test@1.3, 2007-07-27 12:58:49+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_trig_08.test -> mysql-test/suite/funcs_1/t/innodb_trig_08.test

  mysql-test/suite/funcs_1/t/innodb_trig_09.test@1.3, 2007-07-27 12:58:49+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_trig_09.test -> mysql-test/suite/funcs_1/t/innodb_trig_09.test

  mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test@1.3, 2007-07-27 12:58:50+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_trig_1011ext.test -> mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test

  mysql-test/suite/funcs_1/t/innodb_trig_frkey.test@1.3, 2007-07-27 12:58:50+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_trig_frkey.test -> mysql-test/suite/funcs_1/t/innodb_trig_frkey.test

  mysql-test/suite/funcs_1/t/innodb_views.test@1.3, 2007-07-27 12:58:51+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-innodb_views.test -> mysql-test/suite/funcs_1/t/innodb_views.test

  mysql-test/suite/funcs_1/t/memory__datadict.test@1.3, 2007-07-27 12:58:51+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory__datadict.test -> mysql-test/suite/funcs_1/t/memory__datadict.test

  mysql-test/suite/funcs_1/t/memory__load.test@1.3, 2007-07-27 12:58:51+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory__load.test -> mysql-test/suite/funcs_1/t/memory__load.test

  mysql-test/suite/funcs_1/t/memory_bitdata.test@1.3, 2007-07-27 12:58:52+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_bitdata.test -> mysql-test/suite/funcs_1/t/memory_bitdata.test

  mysql-test/suite/funcs_1/t/memory_cursors.test@1.3, 2007-07-27 12:58:52+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_cursors.test -> mysql-test/suite/funcs_1/t/memory_cursors.test

  mysql-test/suite/funcs_1/t/memory_func_view.test@1.3, 2007-07-27 12:58:53+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_func_view.test -> mysql-test/suite/funcs_1/t/memory_func_view.test

  mysql-test/suite/funcs_1/t/memory_storedproc.test@1.3, 2007-07-27 12:58:53+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_storedproc.test -> mysql-test/suite/funcs_1/t/memory_storedproc.test

  mysql-test/suite/funcs_1/t/memory_storedproc_02.test@1.3, 2007-07-27 12:58:53+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_storedproc_02.test -> mysql-test/suite/funcs_1/t/memory_storedproc_02.test

  mysql-test/suite/funcs_1/t/memory_storedproc_03.test@1.3, 2007-07-27 12:58:54+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_storedproc_03.test -> mysql-test/suite/funcs_1/t/memory_storedproc_03.test

  mysql-test/suite/funcs_1/t/memory_storedproc_06.test@1.3, 2007-07-27 12:58:54+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_storedproc_06.test -> mysql-test/suite/funcs_1/t/memory_storedproc_06.test

  mysql-test/suite/funcs_1/t/memory_storedproc_07.test@1.3, 2007-07-27 12:58:55+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_storedproc_07.test -> mysql-test/suite/funcs_1/t/memory_storedproc_07.test

  mysql-test/suite/funcs_1/t/memory_storedproc_08.test@1.3, 2007-07-27 12:58:55+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_storedproc_08.test -> mysql-test/suite/funcs_1/t/memory_storedproc_08.test

  mysql-test/suite/funcs_1/t/memory_storedproc_10.test@1.3, 2007-07-27 12:58:55+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_storedproc_10.test -> mysql-test/suite/funcs_1/t/memory_storedproc_10.test

  mysql-test/suite/funcs_1/t/memory_trig_0102.test@1.3, 2007-07-27 12:58:56+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_trig_0102.test -> mysql-test/suite/funcs_1/t/memory_trig_0102.test

  mysql-test/suite/funcs_1/t/memory_trig_03.test@1.3, 2007-07-27 12:58:56+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_trig_03.test -> mysql-test/suite/funcs_1/t/memory_trig_03.test

  mysql-test/suite/funcs_1/t/memory_trig_0407.test@1.3, 2007-07-27 12:58:57+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_trig_0407.test -> mysql-test/suite/funcs_1/t/memory_trig_0407.test

  mysql-test/suite/funcs_1/t/memory_trig_08.test@1.3, 2007-07-27 12:58:57+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_trig_08.test -> mysql-test/suite/funcs_1/t/memory_trig_08.test

  mysql-test/suite/funcs_1/t/memory_trig_09.test@1.3, 2007-07-27 12:58:58+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_trig_09.test -> mysql-test/suite/funcs_1/t/memory_trig_09.test

  mysql-test/suite/funcs_1/t/memory_trig_1011ext.test@1.3, 2007-07-27 12:58:58+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_trig_1011ext.test -> mysql-test/suite/funcs_1/t/memory_trig_1011ext.test

  mysql-test/suite/funcs_1/t/memory_views.test@1.3, 2007-07-27 12:58:58+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-memory_views.test -> mysql-test/suite/funcs_1/t/memory_views.test

  mysql-test/suite/funcs_1/t/myisam__datadict.test@1.3, 2007-07-27 12:58:59+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam__datadict.test -> mysql-test/suite/funcs_1/t/myisam__datadict.test

  mysql-test/suite/funcs_1/t/myisam__load.test@1.3, 2007-07-27 12:58:59+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam__load.test -> mysql-test/suite/funcs_1/t/myisam__load.test

  mysql-test/suite/funcs_1/t/myisam_bitdata.test@1.3, 2007-07-27 12:59:00+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_bitdata.test -> mysql-test/suite/funcs_1/t/myisam_bitdata.test

  mysql-test/suite/funcs_1/t/myisam_cursors.test@1.3, 2007-07-27 12:59:00+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_cursors.test -> mysql-test/suite/funcs_1/t/myisam_cursors.test

  mysql-test/suite/funcs_1/t/myisam_func_view.test@1.3, 2007-07-27 12:59:00+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_func_view.test -> mysql-test/suite/funcs_1/t/myisam_func_view.test

  mysql-test/suite/funcs_1/t/myisam_storedproc.test@1.3, 2007-07-27 12:59:01+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_storedproc.test -> mysql-test/suite/funcs_1/t/myisam_storedproc.test

  mysql-test/suite/funcs_1/t/myisam_storedproc_02.test@1.3, 2007-07-27 12:59:01+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_storedproc_02.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_02.test

  mysql-test/suite/funcs_1/t/myisam_storedproc_03.test@1.3, 2007-07-27 12:59:02+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_storedproc_03.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_03.test

  mysql-test/suite/funcs_1/t/myisam_storedproc_06.test@1.3, 2007-07-27 12:59:02+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_storedproc_06.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_06.test

  mysql-test/suite/funcs_1/t/myisam_storedproc_07.test@1.3, 2007-07-27 12:59:03+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_storedproc_07.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_07.test

  mysql-test/suite/funcs_1/t/myisam_storedproc_08.test@1.3, 2007-07-27 12:59:03+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_storedproc_08.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_08.test

  mysql-test/suite/funcs_1/t/myisam_storedproc_10.test@1.3, 2007-07-27 12:59:03+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_storedproc_10.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_10.test

  mysql-test/suite/funcs_1/t/myisam_trig_0102.test@1.3, 2007-07-27 12:59:04+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_trig_0102.test -> mysql-test/suite/funcs_1/t/myisam_trig_0102.test

  mysql-test/suite/funcs_1/t/myisam_trig_03.test@1.3, 2007-07-27 12:59:04+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_trig_03.test -> mysql-test/suite/funcs_1/t/myisam_trig_03.test

  mysql-test/suite/funcs_1/t/myisam_trig_0407.test@1.3, 2007-07-27 12:59:05+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_trig_0407.test -> mysql-test/suite/funcs_1/t/myisam_trig_0407.test

  mysql-test/suite/funcs_1/t/myisam_trig_08.test@1.3, 2007-07-27 12:59:05+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_trig_08.test -> mysql-test/suite/funcs_1/t/myisam_trig_08.test

  mysql-test/suite/funcs_1/t/myisam_trig_09.test@1.3, 2007-07-27 12:59:06+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_trig_09.test -> mysql-test/suite/funcs_1/t/myisam_trig_09.test

  mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test@1.3, 2007-07-27 12:59:06+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_trig_1011ext.test -> mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test

  mysql-test/suite/funcs_1/t/myisam_views.test@1.3, 2007-07-27 12:59:06+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-myisam_views.test -> mysql-test/suite/funcs_1/t/myisam_views.test

  mysql-test/suite/funcs_1/triggers/trig_frkey.inc@1.3, 2007-07-27 12:59:07+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-trig_frkey.inc -> mysql-test/suite/funcs_1/triggers/trig_frkey.inc

  mysql-test/suite/funcs_1/triggers/trig_frkey2.inc@1.3, 2007-07-27 12:59:07+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-trig_frkey2.inc -> mysql-test/suite/funcs_1/triggers/trig_frkey2.inc

  mysql-test/suite/funcs_1/triggers/triggers_0102.inc@1.3, 2007-07-27 12:59:08+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-triggers_0102.inc -> mysql-test/suite/funcs_1/triggers/triggers_0102.inc

  mysql-test/suite/funcs_1/triggers/triggers_03.inc@1.3, 2007-07-27 12:59:08+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-triggers_03.inc -> mysql-test/suite/funcs_1/triggers/triggers_03.inc

  mysql-test/suite/funcs_1/triggers/triggers_0407.inc@1.3, 2007-07-27 12:59:08+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-triggers_0407.inc -> mysql-test/suite/funcs_1/triggers/triggers_0407.inc

  mysql-test/suite/funcs_1/triggers/triggers_08.inc@1.3, 2007-07-27 12:59:09+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-triggers_08.inc -> mysql-test/suite/funcs_1/triggers/triggers_08.inc

  mysql-test/suite/funcs_1/triggers/triggers_09.inc@1.3, 2007-07-27 12:59:09+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-triggers_09.inc -> mysql-test/suite/funcs_1/triggers/triggers_09.inc

  mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc@1.3, 2007-07-27 12:59:10+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-triggers_1011ext.inc -> mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc

  mysql-test/suite/funcs_1/triggers/triggers_master.test@1.3, 2007-07-27 12:59:10+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-triggers_master.test -> mysql-test/suite/funcs_1/triggers/triggers_master.test

  mysql-test/suite/funcs_1/views/func_view.inc@1.3, 2007-07-27 12:59:11+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-func_view.inc -> mysql-test/suite/funcs_1/views/func_view.inc

  mysql-test/suite/funcs_1/views/fv1.inc@1.3, 2007-07-27 12:59:11+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-fv1.inc -> mysql-test/suite/funcs_1/views/fv1.inc

  mysql-test/suite/funcs_1/views/fv2.inc@1.3, 2007-07-27 12:59:11+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-fv2.inc -> mysql-test/suite/funcs_1/views/fv2.inc

  mysql-test/suite/funcs_1/views/fv_cast.inc@1.3, 2007-07-27 12:59:12+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-fv_cast.inc -> mysql-test/suite/funcs_1/views/fv_cast.inc

  mysql-test/suite/funcs_1/views/fv_if1.inc@1.3, 2007-07-27 12:59:12+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-fv_if1.inc -> mysql-test/suite/funcs_1/views/fv_if1.inc

  mysql-test/suite/funcs_1/views/fv_if2.inc@1.3, 2007-07-27 12:59:13+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-fv_if2.inc -> mysql-test/suite/funcs_1/views/fv_if2.inc

  mysql-test/suite/funcs_1/views/fv_ifnull.inc@1.3, 2007-07-27 12:59:13+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-fv_ifnull.inc -> mysql-test/suite/funcs_1/views/fv_ifnull.inc

  mysql-test/suite/funcs_1/views/views_master.inc@1.4, 2007-07-27 12:59:14+02:00, joerg@debian.(none) +0 -0
    Rename: BitKeeper/deleted/.del-views_master.inc -> mysql-test/suite/funcs_1/views/views_master.inc

ChangeSet@1.2536.17.5, 2007-07-27 14:28:36+03:00, gkodinov@magare.gmz +2 -0
  5.0-opt -> 5.1-opt merge of the test case for bug 29571:
   - reset the logs before and after the test.
   - cleanup from the previous tests : use the correct schema.

  mysql-test/extra/rpl_tests/rpl_insert_delayed.test@1.7, 2007-07-27 14:28:34+03:00, gkodinov@magare.gmz +13 -2
    5.0-opt -> 5.1-opt merge of the test case for bug 29571.

  mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result@1.3, 2007-07-27 14:28:34+03:00, gkodinov@magare.gmz +52 -0
    5.0-opt -> 5.1-opt merge of the test case for bug 29571.

ChangeSet@1.1810.3168.3, 2007-07-27 14:30:25+05:00, svoj@mysql.com +3 -0
  BUG#29957 - alter_table.test fails
  
  INSERT/DELETE/UPDATE followed by ALTER TABLE within LOCK TABLES
  may cause table corruption on Windows.
  
  That happens because ALTER TABLE writes outdated shared state
  info into index file.
  
  Fixed by removing obsolete workaround.
  
  Affects MyISAM tables on Windows only.

  mysql-test/r/alter_table.result@1.49.1.18, 2007-07-27 14:30:24+05:00, svoj@mysql.com +12 -0
    A test case for BUG#29957.

  mysql-test/t/alter_table.test@1.36.1.18, 2007-07-27 14:30:24+05:00, svoj@mysql.com +12 -0
    A test case for BUG#29957.

  myisam/mi_extra.c@1.44.5.1, 2007-07-27 14:30:24+05:00, svoj@mysql.com +1 -1
    On windows when mi_extra(HA_EXTRA_PREPARE_FOR_DELETE) is called,
    we release external lock and close index file. If we're in LOCK
    TABLES, MyISAM state info doesn't get updated until UNLOCK TABLES.
    
    That means when we release external lock and we're in LOCK TABLES,
    we may write outdated state info.
    
    As SQL layer closes all table instances, we do not need this
    workaround anymore.

ChangeSet@1.2536.20.1, 2007-07-27 00:31:06-06:00, malff@weblab.(none) +39 -0
  WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
  Bug#25422 (Hang with log tables)
  Bug 17876 (Truncating mysql.slow_log in a SP after using cursor locks the
            thread)
  Bug 23044 (Warnings on flush of a log table)
  Bug 29129 (Resetting general_log while the GLOBAL READ LOCK is set causes
             a deadlock)
  
  Prior to this fix, the server would hang when performing concurrent
  ALTER TABLE or TRUNCATE TABLE statements against the LOG TABLES,
  which are mysql.general_log and mysql.slow_log.
  
  The root cause traces to the following code:
  in sql_base.cc, open_table()
    if (table->in_use != thd)
    {
      /* wait_for_condition will unlock LOCK_open for us */
      wait_for_condition(thd, &LOCK_open, &COND_refresh);
    }
  The problem with this code is that the current implementation of the
  LOGGER creates 'fake' THD objects, like
  - Log_to_csv_event_handler::general_log_thd
  - Log_to_csv_event_handler::slow_log_thd
  which are not associated to a real thread running in the server,
  so that waiting for these non-existing threads to release table locks
  cause the dead lock.
  
  In general, the design of Log_to_csv_event_handler does not fit into the
  general architecture of the server, so that the concept of general_log_thd
  and slow_log_thd has to be abandoned:
  - this implementation does not work with table locking
  - it will not work with commands like SHOW PROCESSLIST
  - having the log tables always opened does not integrate well with DDL
  operations / FLUSH TABLES / SET GLOBAL READ_ONLY
  
  With this patch, the fundamental design of the LOGGER has been changed to:
  - always open and close a log table when writing a log
  - remove totally the usage of fake THD objects
  - clarify how locking of log tables is implemented in general.
  
  See WL#3984 for details related to the new locking design.
  
  Additional changes (misc bugs exposed and fixed):
  
  1)
  
  mysqldump which would ignore some tables in dump_all_tables_in_db(),
   but forget to ignore the same in dump_all_views_in_db().
  
  2)
  
  mysqldump would also issue an empty "LOCK TABLE" command when all the tables
  to lock are to be ignored (numrows == 0), instead of not issuing the query.
  
  3)
  
  Internal errors handlers could intercept errors but not warnings
  (see sql_error.cc).
  
  4)
  
  Implementing a nested call to open tables, for the performance schema tables,
  exposed an existing bug in remove_table_from_cache(), which would perform:
    in_use->some_tables_deleted=1;
  against another thread, without any consideration about thread locking.
  This call inside remove_table_from_cache() was not required anyway,
  since calling mysql_lock_abort() takes care of aborting -- cleanly -- threads
  that might hold a lock on a table.
  This line (in_use->some_tables_deleted=1) has been removed.

  client/mysqldump.c@1.286.1.1, 2007-07-26 21:39:55-06:00, malff@weblab.(none) +20 -5
    Don't lock tables in the ignore list.
    Don't issue empty LOCK TABLES queries.

  mysql-test/r/log_state.result@1.4.1.1, 2007-07-27 00:29:20-06:00, malff@weblab.(none) +23 -1
    Changed the default location of the log output to LOG_FILE,
    for backward compatibility with MySQL 5.0
    ---
    Adjust test results

  mysql-test/r/log_tables.result@1.20, 2007-07-27 00:29:20-06:00, malff@weblab.(none) +0 -30
    cleanup for -ps-protocol

  mysql-test/r/log_tables.result@1.19, 2007-07-26 21:45:32-06:00, malff@weblab.(none) +299 -28
    Adjust test results

  mysql-test/r/ps.result@1.118, 2007-07-26 21:45:32-06:00, malff@weblab.(none) +23 -31
    Adjust test results

  mysql-test/r/show_check.result@1.118.1.1, 2007-07-26 21:45:32-06:00, malff@weblab.(none) +14 -17
    Adjust test results

  mysql-test/r/status.result@1.17, 2007-07-26 21:45:32-06:00, malff@weblab.(none) +6 -6
    Adjust test results

  mysql-test/t/log_state.test@1.8, 2007-07-26 21:45:32-06:00, malff@weblab.(none) +53 -0
    Added tests for Bug#29129

  mysql-test/t/log_tables.test@1.18, 2007-07-27 00:29:20-06:00, malff@weblab.(none) +0 -13
    cleanup for -ps-protocol

  mysql-test/t/log_tables.test@1.17, 2007-07-26 21:45:32-06:00, malff@weblab.(none) +353 -70
    Can not lock a log table: adjusted the tests.
    Added tests for Bug#25422, Bug#23044, Bug#17876

  mysql-test/t/ps.test@1.120, 2007-07-26 21:45:32-06:00, malff@weblab.(none) +7 -0
    Make the test output deterministic

  mysql-test/t/show_check.test@1.82.1.1, 2007-07-26 21:45:32-06:00, malff@weblab.(none) +7 -0
    Make the test output deterministic

  sql/handler.cc@1.316.1.1, 2007-07-26 18:26:39-06:00, malff@weblab.(none) +12 -28
    Moved logic for system / log tables in the SQL layer.

  sql/handler.h@1.269, 2007-07-26 18:26:39-06:00, malff@weblab.(none) +1 -38
    Moved logic for system / log tables in the SQL layer.

  sql/lock.cc@1.111.1.1, 2007-07-26 18:26:39-06:00, malff@weblab.(none) +63 -13
    Revised locking of log tables

  sql/log.cc@1.282.1.18, 2007-07-26 18:26:39-06:00, malff@weblab.(none) +297 -435
    Major cleanup: changed how log tables are locked / written to.

  sql/log.h@1.27, 2007-07-26 18:26:39-06:00, malff@weblab.(none) +15 -78
    Major cleanup: changed how log tables are locked / written to.

  sql/mysql_priv.h@1.530.1.1, 2007-07-26 18:26:39-06:00, malff@weblab.(none) +13 -1
    performance schema helpers

  sql/set_var.cc@1.243.1.1, 2007-07-27 00:29:20-06:00, malff@weblab.(none) +11 -17
    Changed the default location of the log output to LOG_FILE,
    for backward compatibility with MySQL 5.0
    ---
    log tables cleanup

  sql/share/errmsg.txt@1.163.1.1, 2007-07-26 18:26:41-06:00, malff@weblab.(none) +2 -2
    Changed the wording and name of ER_CANT_READ_LOCK_LOG_TABLE

  sql/slave.cc@1.308.1.8, 2007-07-26 18:26:39-06:00, malff@weblab.(none) +1 -1
    open_ltable() lock flags

  sql/sp.cc@1.163, 2007-07-26 18:26:39-06:00, malff@weblab.(none) +1 -1
    open_ltable() lock flags

  sql/sql_acl.cc@1.242, 2007-07-26 18:26:39-06:00, malff@weblab.(none) +1 -1
    open_ltable() lock flags

  sql/sql_base.cc@1.414.1.1, 2007-07-26 21:39:57-06:00, malff@weblab.(none) +97 -33
    log tables cleanup
    performance schema helpers

  sql/sql_class.h@1.387, 2007-07-26 18:26:40-06:00, malff@weblab.(none) +1 -0
    performance schema helpers

  sql/sql_delete.cc@1.224, 2007-07-26 18:26:40-06:00, malff@weblab.(none) +0 -22
    log tables cleanup in TRUNCATE

  sql/sql_error.cc@1.46, 2007-07-26 18:26:40-06:00, malff@weblab.(none) +3 -0
    Internal handlers can also intercept warnings

  sql/sql_insert.cc@1.288, 2007-07-26 18:26:40-06:00, malff@weblab.(none) +1 -1
    open_ltable() lock flags

  sql/sql_parse.cc@1.693.2.1, 2007-07-26 18:26:40-06:00, malff@weblab.(none) +24 -5
    performance schema helpers

  sql/sql_plugin.cc@1.66.1.5, 2007-07-26 18:26:40-06:00, malff@weblab.(none) +2 -2
    open_ltable() lock flags

  sql/sql_rename.cc@1.47, 2007-07-26 18:26:40-06:00, malff@weblab.(none) +0 -20
    log tables cleanup in RENAME

  sql/sql_servers.cc@1.13, 2007-07-26 18:26:40-06:00, malff@weblab.(none) +3 -3
    open_ltable() lock flags

  sql/sql_show.cc@1.425, 2007-07-26 18:26:40-06:00, malff@weblab.(none) +0 -3
    Move INFORMATION_SCHEMA_NAME to table.cc

  sql/sql_table.cc@1.440.2.1, 2007-07-26 18:26:40-06:00, malff@weblab.(none) +9 -40
    log tables cleanup (admin operations, ALTER TABLE)

  sql/sql_udf.cc@1.79, 2007-07-26 18:26:40-06:00, malff@weblab.(none) +2 -2
    open_ltable() lock flags

  sql/table.cc@1.298.2.1, 2007-07-26 18:26:40-06:00, malff@weblab.(none) +60 -20
    Implemented TABLE_CATEGORY.

  sql/table.h@1.177.1.1, 2007-07-26 18:26:41-06:00, malff@weblab.(none) +108 -12
    Implemented TABLE_CATEGORY.

  storage/csv/ha_tina.cc@1.83, 2007-07-26 18:29:30-06:00, malff@weblab.(none) +0 -12
    Moved logic for system / log tables in the SQL layer.

  storage/csv/ha_tina.h@1.33, 2007-07-26 18:29:31-06:00, malff@weblab.(none) +0 -5
    Moved logic for system / log tables in the SQL layer.

  storage/myisam/ha_myisam.cc@1.229, 2007-07-26 18:29:31-06:00, malff@weblab.(none) +1 -35
    Moved logic for system / log tables in the SQL layer.

  storage/myisam/ha_myisam.h@1.87, 2007-07-26 18:29:32-06:00, malff@weblab.(none) +0 -5
    Moved logic for system / log tables in the SQL layer.

ChangeSet@1.1810.3190.4, 2007-07-26 23:39:53-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #25061 Build failure on HP/UX similar to BUG#20507
  
  Added libCsup as a mysql library dependency on hpux11.
  
  This means any projects statically linking to our libraries using the HPUX11 compiler will need to add the -lCSup option to their build link options. If they use the mysql_config tool this will happen automatically.
  
  Projects that dynamically link to libmysqlclient will continue to work without any modifications.
  
  Library libCsup is a C++ runtime library needed for yassl support when built with the hpux11 C/C++ compiler. The first attempts to fix this bug were to remove the yassl dependencies on libCsup. We tried removing all pure virtual functions and other hacks, but the dependency remained. The only other options left involve extensive restructuring of the yassl library.
      

  config/ac-macros/yassl.m4@1.10.3.1, 2007-07-26 23:39:50-04:00, dkatz@damien-katzs-computer.local +9 -0
    Added libCsup as a mysql library dependency on hpux11 when building yassl.

ChangeSet@1.1810.3198.1, 2007-07-26 20:52:53+04:00, sergefp@mysql.com +4 -0
  BUG#28591: make the fix work for BDB tables too:
   - make ha_berkeley::cmp_ref() take into account that auto-generated PKs 
     are stored in LSB-first order. 
   - Remove the temporary code that made the bugfix work for innodb only 

  mysql-test/r/bdb.result@1.48.4.1, 2007-07-26 20:52:42+04:00, sergefp@mysql.com +1 -1
    Adjust test-results.

  sql/ha_berkeley.cc@1.151.10.1, 2007-07-26 20:52:42+04:00, sergefp@mysql.com +5 -1
    BUG#28591: make the fix work for BDB tables too:
     - make ha_berkeley::cmp_ref() take into account that auto-generated PKs 
       are stored in LSB-first order. 

  sql/sql_select.cc@1.312.1.231, 2007-07-26 20:52:42+04:00, sergefp@mysql.com +0 -1
    BUG#28591: Remove "innodb only" clause as the fix now works for BDB too

  sql/table.cc@1.160.1.97, 2007-07-26 20:52:43+04:00, sergefp@mysql.com +1 -2
    BUG#28591: Remove "innodb only" clause as the fix now works for BDB too

ChangeSet@1.2536.11.8, 2007-07-26 20:05:01+04:00, anozdrin@ibm. +1 -0
  Fix for BUG#30029: mysql_upgrade fails for 5.0 -> 5.1.21,
  5.1.20 -> 5.1.21 upgrades.
  
  We generate mysql_fix_privilege.sql file, which contains SQL
  statements required to upgrade the system database. This script
  is generated by concatenation of mysql_system_tables.sql and
  mysql_system_tables_fix.sql.
  
  The problem was that
    - in order to create general_log and slow_log tables we use
      stored programs in mysql_system_tables.sql;
    - we upgrade mysql.proc table in mysql_system_tables_fix.sql;
  
  So, if mysql.proc table needs to be upgraded, stored procedures
  can not be used in mysql_system_tables.sql.
  
  In other words, in mysql_system_tables.sql stored programs must
  not be used because they may be unavailable at this point.
  
  The fix is to use dynamic SQL instead of stored programs.
  
  There is no test case for this bug because our test suite
  is not suitable for such test cases. system_mysql_db_fix* test
  cases play with the database "test". Here we need to modify
  the system database and we can not do that in the test suite.

  scripts/mysql_system_tables.sql@1.12, 2007-07-26 20:04:59+04:00, anozdrin@ibm. +13 -8
    Use dynamic SQL instead of stored programs.

ChangeSet@1.2536.17.3, 2007-07-26 18:33:05+03:00, gkodinov@magare.gmz +3 -0
  Bug #30036: SHOW TABLE TYPES causes the debug client to crash
  
  SHOW TABLE TYPES is a (to be deprecated) synonym for 
  SHOW STORAGE ENGINES.
  Fixed to use the right schema table in addition to 
  issuing a warning.

  mysql-test/r/show_check.result@1.120, 2007-07-26 18:33:02+03:00, gkodinov@magare.gmz +1 -0
    Bug #30036: test case

  mysql-test/t/show_check.test@1.83, 2007-07-26 18:33:03+03:00, gkodinov@magare.gmz +8 -0
    Bug #30036: test case

  sql/sql_yacc.yy@1.591, 2007-07-26 18:33:03+03:00, gkodinov@magare.gmz +2 -0
    Bug #30036: use the right schema table

ChangeSet@1.1810.3197.1, 2007-07-26 17:25:03+02:00, joerg@debian.(none) +84 -0
  Remove the "row_lock" suite from the sources.
  
  For more information, see WL#3866 and the bugs numbered 28685 and 20390.

  BitKeeper/deleted/.del-innodb_row_lock_1.result@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_1.result

  BitKeeper/deleted/.del-innodb_row_lock_1.test@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_1.test

  BitKeeper/deleted/.del-innodb_row_lock_2.result@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_2.result

  BitKeeper/deleted/.del-innodb_row_lock_2.test@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_2.test

  BitKeeper/deleted/.del-innodb_row_lock_3.result@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_3.result

  BitKeeper/deleted/.del-innodb_row_lock_3.test@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_3.test

  BitKeeper/deleted/.del-innodb_row_lock_4.result@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_4.result

  BitKeeper/deleted/.del-innodb_row_lock_4.test@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_4.test

  BitKeeper/deleted/.del-innodb_row_lock_5.result@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_5.result

  BitKeeper/deleted/.del-innodb_row_lock_5.test@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_5.test

  BitKeeper/deleted/.del-innodb_row_lock_big_tab.result@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab.result

  BitKeeper/deleted/.del-innodb_row_lock_big_tab.test@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab.test

  BitKeeper/deleted/.del-innodb_row_lock_big_tab_1.result@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_1.result

  BitKeeper/deleted/.del-innodb_row_lock_big_tab_1.test@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_1.test

  BitKeeper/deleted/.del-innodb_row_lock_big_tab_2.result@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_2.result

  BitKeeper/deleted/.del-innodb_row_lock_big_tab_2.test@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_2.test

  BitKeeper/deleted/.del-innodb_row_lock_trig_1.result@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_trig_1.result

  BitKeeper/deleted/.del-innodb_row_lock_trig_1.test@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_trig_1.test

  BitKeeper/deleted/.del-innodb_row_lock_trig_2.result@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_trig_2.result

  BitKeeper/deleted/.del-innodb_row_lock_trig_2.test@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_trig_2.test

  BitKeeper/deleted/.del-innodb_row_lock_view_1.result@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_1.result

  BitKeeper/deleted/.del-innodb_row_lock_view_1.test@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_1.test

  BitKeeper/deleted/.del-innodb_row_lock_view_2.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_2.result

  BitKeeper/deleted/.del-innodb_row_lock_view_2.test@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_2.test

  BitKeeper/deleted/.del-innodb_row_lock_view_mix_1.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_1.result

  BitKeeper/deleted/.del-innodb_row_lock_view_mix_1.test@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_1.test

  BitKeeper/deleted/.del-innodb_row_lock_view_mix_2.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_2.result

  BitKeeper/deleted/.del-innodb_row_lock_view_mix_2.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_2.test

  BitKeeper/deleted/.del-innodb_row_lock_view_storedp_1.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_1.result

  BitKeeper/deleted/.del-innodb_row_lock_view_storedp_1.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_1.test

  BitKeeper/deleted/.del-innodb_row_lock_view_storedp_2.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_2.result

  BitKeeper/deleted/.del-innodb_row_lock_view_storedp_2.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_2.test

  BitKeeper/deleted/.del-innodb_row_lock_view_trig_1.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_1.result

  BitKeeper/deleted/.del-innodb_row_lock_view_trig_1.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_1.test

  BitKeeper/deleted/.del-innodb_row_lock_view_trig_2.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_2.result

  BitKeeper/deleted/.del-innodb_row_lock_view_trig_2.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_2.test

  BitKeeper/deleted/.del-ndb_row_lock_1.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_1.result

  BitKeeper/deleted/.del-ndb_row_lock_1.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_1.test

  BitKeeper/deleted/.del-ndb_row_lock_2.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_2.result

  BitKeeper/deleted/.del-ndb_row_lock_2.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_2.test

  BitKeeper/deleted/.del-ndb_row_lock_3.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_3.result

  BitKeeper/deleted/.del-ndb_row_lock_3.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_3.test

  BitKeeper/deleted/.del-ndb_row_lock_4.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_4.result

  BitKeeper/deleted/.del-ndb_row_lock_4.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_4.test

  BitKeeper/deleted/.del-ndb_row_lock_5.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_5.result

  BitKeeper/deleted/.del-ndb_row_lock_5.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_5.test

  BitKeeper/deleted/.del-ndb_row_lock_big_tab.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab.result

  BitKeeper/deleted/.del-ndb_row_lock_big_tab.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab.test

  BitKeeper/deleted/.del-ndb_row_lock_big_tab_1.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_1.result

  BitKeeper/deleted/.del-ndb_row_lock_big_tab_1.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_1.test

  BitKeeper/deleted/.del-ndb_row_lock_big_tab_2.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_2.result

  BitKeeper/deleted/.del-ndb_row_lock_big_tab_2.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_2.test

  BitKeeper/deleted/.del-ndb_row_lock_trig_1.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_trig_1.result

  BitKeeper/deleted/.del-ndb_row_lock_trig_1.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_trig_1.test

  BitKeeper/deleted/.del-ndb_row_lock_trig_2.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_trig_2.result

  BitKeeper/deleted/.del-ndb_row_lock_trig_2.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_trig_2.test

  BitKeeper/deleted/.del-ndb_row_lock_view_1.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_1.result

  BitKeeper/deleted/.del-ndb_row_lock_view_1.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_1.test

  BitKeeper/deleted/.del-ndb_row_lock_view_2.result@1.2, 2007-07-26 17:16:18+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_2.result

  BitKeeper/deleted/.del-ndb_row_lock_view_2.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_2.test

  BitKeeper/deleted/.del-ndb_row_lock_view_mix_1.result@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_1.result

  BitKeeper/deleted/.del-ndb_row_lock_view_mix_1.test@1.2, 2007-07-26 17:16:20+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_1.test

  BitKeeper/deleted/.del-ndb_row_lock_view_mix_2.result@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_2.result

  BitKeeper/deleted/.del-ndb_row_lock_view_mix_2.test@1.2, 2007-07-26 17:16:21+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_2.test

  BitKeeper/deleted/.del-ndb_row_lock_view_storedp_1.result@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_1.result

  BitKeeper/deleted/.del-ndb_row_lock_view_storedp_1.test@1.2, 2007-07-26 17:16:21+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_1.test

  BitKeeper/deleted/.del-ndb_row_lock_view_storedp_2.result@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_2.result

  BitKeeper/deleted/.del-ndb_row_lock_view_storedp_2.test@1.2, 2007-07-26 17:16:21+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_2.test

  BitKeeper/deleted/.del-ndb_row_lock_view_trig_1.result@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_1.result

  BitKeeper/deleted/.del-ndb_row_lock_view_trig_1.test@1.2, 2007-07-26 17:16:21+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_1.test

  BitKeeper/deleted/.del-ndb_row_lock_view_trig_2.result@1.2, 2007-07-26 17:16:19+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_2.result

  BitKeeper/deleted/.del-ndb_row_lock_view_trig_2.test@1.2, 2007-07-26 17:16:21+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_2.test

  BitKeeper/deleted/.del-readme.txt@1.2, 2007-07-26 17:16:16+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/readme.txt

  BitKeeper/deleted/.del-row_lock.inc@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/include/row_lock.inc

  BitKeeper/deleted/.del-row_lock_big_tab.inc@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/include/row_lock_big_tab.inc

  BitKeeper/deleted/.del-row_lock_big_tab_1.inc@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/include/row_lock_big_tab_1.inc

  BitKeeper/deleted/.del-row_lock_big_tab_2.inc@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/include/row_lock_big_tab_2.inc

  BitKeeper/deleted/.del-row_lock_trig.inc@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/include/row_lock_trig.inc

  BitKeeper/deleted/.del-row_lock_view.inc@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/include/row_lock_view.inc

  BitKeeper/deleted/.del-row_lock_view_mix.inc@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/include/row_lock_view_mix.inc

  BitKeeper/deleted/.del-row_lock_view_storedp.inc@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/include/row_lock_view_storedp.inc

  BitKeeper/deleted/.del-row_lock_view_trig.inc@1.2, 2007-07-26 17:16:17+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/include/row_lock_view_trig.inc

  BitKeeper/deleted/.del-summary_of_sel_test.txt@1.2, 2007-07-26 17:16:16+02:00, joerg@debian.(none) +0 -0
    Delete: mysql-test/suite/row_lock/summary_of_sel_test.txt

  Makefile.am@1.68.1.39, 2007-07-26 17:24:55+02:00, joerg@debian.(none) +1 -2
    Remove the "row_lock" suite from the "test-bt" target.
    
    Also, a formatting change: empty line for better readability.

ChangeSet@1.2540, 2007-07-26 16:44:57+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
  BUG#29809 (Slave SQL errors in warnings file):
  Adding code to filter out slave SQL errors since these are checked by
  the tests themselves.

  mysql-test/lib/mtr_report.pl@1.57.2.1, 2007-07-26 16:44:51+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Filtering out slave SQL errors since these are handled by the
    tests themselves.

  mysql-test/suite/rpl/t/disabled.def@1.7, 2007-07-26 16:44:51+02:00, mats@kindahl-laptop.dnsalias.net +0 -15
    Enabling disabled tests.

  mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result@1.15, 2007-07-26 16:44:51+02:00, mats@kindahl-laptop.dnsalias.net +22 -26
    Result change.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.5, 2007-07-26 16:44:52+02:00, mats@kindahl-laptop.dnsalias.net +0 -2
    Enabling disabled tests.

ChangeSet@1.1810.3192.3, 2007-07-26 16:59:21+03:00, gkodinov@magare.gmz +2 -0
  Addendum to bug 29571: wait for INSERT DELAYED to finish on master

  mysql-test/r/rpl_insert_delayed.result@1.1.1.2, 2007-07-26 16:59:19+03:00, gkodinov@magare.gmz +3 -0
    Addendum to bug 29571: wait for INSERT DELAYED to finish on master

  mysql-test/t/rpl_insert_delayed.test@1.1.1.2, 2007-07-26 16:59:19+03:00, gkodinov@magare.gmz +1 -0
    Addendum to bug 29571: wait for INSERT DELAYED to finish on master

ChangeSet@1.1810.3194.3, 2007-07-26 14:31:11+02:00, jperkin@production.mysql.com +1 -0
  mysql_install_db.sh:
    Fix error in previous change, correct --language argument.

  scripts/mysql_install_db.sh@1.64.1.30, 2007-07-26 14:30:29+02:00, jperkin@production.mysql.com +1 -1
    Fix error in previous change, correct --language argument.

ChangeSet@1.1810.3194.2, 2007-07-26 14:27:36+02:00, jperkin@production.mysql.com +1 -0
  Apply a few more cleanups to improve the robustness of mysql_install_db

  scripts/mysql_install_db.sh@1.64.1.29, 2007-07-26 14:24:17+02:00, jperkin@production.mysql.com +9 -0
    Put back variable initialisation for those which could be passed
    in via the environment and confuse the script.

  scripts/mysql_install_db.sh@1.64.1.28, 2007-07-26 14:16:51+02:00, jperkin@production.mysql.com +2 -3
    No need for temporary $langdir variable.

  scripts/mysql_install_db.sh@1.64.1.27, 2007-07-26 14:05:47+02:00, jperkin@production.mysql.com +2 -1
    Indent "for arg do" correctly, both to retain existing style
    used in the rest of the script, and also to provide better
    shell compatability.

ChangeSet@1.1810.3194.1, 2007-07-26 12:57:46+02:00, jperkin@production.mysql.com +2 -0
  Clean up the mysql_install_db script to ensure that a sane environment is
  available and reduce the chance of failure.  This should fix bug#28585
  which is caused by the script being quite random in how it finds files it
  requires and not giving very good feedback to the user about what went
  wrong.
  
  Also update make_binary_distribution so that it provides the correct path
  to the required SQL scripts when generating mysql_install_db.  The script
  only previously worked because of the permissive behaviour which looked
  around the current working directory before the "correct" location.  This
  could lead to severe problems if the user happened to run the script from
  a location which contained older or even broken copies of the SQL scripts.
  
  We now require either a complete binary release (and the mysql_install_db
  script ran from inside the extracted archive), or an installed compiled
  tree, as this is the only way we can be sure everything that we need is
  available and ready to run.
  
  While working on this fix, also clean up the mysql_install_db script a lot
  to make it simpler, easier to read, and hopefully less prone to bugs in
  the future.

  scripts/make_binary_distribution.sh@1.101.1.28, 2007-07-26 11:03:13+02:00, jperkin@production.mysql.com +1 -1
    SQL files live in ./share not ./support-files in binary distribution.

  scripts/mysql_install_db.sh@1.64.1.26, 2007-07-26 12:43:09+02:00, jperkin@production.mysql.com +15 -10
    Use a consistent shell indentation style.

  scripts/mysql_install_db.sh@1.64.1.25, 2007-07-26 12:40:12+02:00, jperkin@production.mysql.com +1 -3
    Missed $mysqld_opt in the previous commit.
    Add some more comments.

  scripts/mysql_install_db.sh@1.64.1.24, 2007-07-26 12:38:10+02:00, jperkin@production.mysql.com +0 -8
    Don't bother initialising string variables.  Due to the way the
    script is constructed, this needs to be done in two different
    places if done at all, and as we quote all variables correctly
    now there's no real reason to do it at all.

  scripts/mysql_install_db.sh@1.64.1.23, 2007-07-26 12:31:43+02:00, jperkin@production.mysql.com +3 -3
    Be consistent in how we echo a null string.

  scripts/mysql_install_db.sh@1.64.1.22, 2007-07-26 12:28:58+02:00, jperkin@production.mysql.com +10 -13
    No need to test for $fill_help_tables again, we already did that.

  scripts/mysql_install_db.sh@1.64.1.21, 2007-07-26 12:25:52+02:00, jperkin@production.mysql.com +6 -5
    Standardise on numerical comparison instead of mixing both numeric
    and string.

  scripts/mysql_install_db.sh@1.64.1.20, 2007-07-26 12:23:20+02:00, jperkin@production.mysql.com +9 -9
    Make sure all variables and strings are properly quoted.

  scripts/mysql_install_db.sh@1.64.1.19, 2007-07-26 12:17:52+02:00, jperkin@production.mysql.com +1 -4
    $scriptdir isn't used anywhere, remove it.
    $ip is useless, remove it.

  scripts/mysql_install_db.sh@1.64.1.18, 2007-07-26 12:09:21+02:00, jperkin@production.mysql.com +18 -19
    Simplify search for mysqld, and give more feedback to the user if
    we hit failure with the supplied --basedir.
    No need to duplicate the 'make install' suggestion as we now do
    that as soon as possible by checking for my_print_defaults.

  scripts/mysql_install_db.sh@1.64.1.17, 2007-07-26 11:50:23+02:00, jperkin@production.mysql.com +14 -40
    Look for the SQL bootstrap files either in the supplied --srcdir
    argument or within the installed compile/binary release.  Anything
    else could lead to problems by finding older/broken copies.
    The make_binary_distribution script is now fixed to look in the
    correct place for binary releases.

  scripts/mysql_install_db.sh@1.64.1.16, 2007-07-26 11:35:37+02:00, jperkin@production.mysql.com +12 -15
    Ensure we can use the correct my_print_defaults for the chosen
    installation method (binary release or source compile) and do not
    try and rely on $PATH as a fallback as that will only lead to
    confusion later on when things aren't where we expect them to
    be.  Debian reverted back from using "mysql_print_defaults" a
    long time ago so we don't need to check for that as well.

  scripts/mysql_install_db.sh@1.64.1.15, 2007-07-26 11:29:42+02:00, jperkin@production.mysql.com +12 -15
    Remove more copy+paste, iterate over database directories instead.

  scripts/mysql_install_db.sh@1.64.1.14, 2007-07-26 11:13:51+02:00, jperkin@production.mysql.com +9 -4
    Reduce copy+paste programming, add parse_arg() to handle grabbing
    long-option arguments.

  scripts/mysql_install_db.sh@1.64.1.13, 2007-07-26 11:09:53+02:00, jperkin@production.mysql.com +34 -0
    Display usage text via --help

ChangeSet@1.1616.3083.1, 2007-07-26 12:52:13+02:00, joerg@debian.(none) +1 -0
  Raise the 64 character limit for path names in the error messages
  to 150 or 107 characters for those messages which are generated
  by the embedded server during release builds.
  
  This fixes bug#16635:
     Error messages wrong: absolute path names, "%s" format code
  
  See the bug report or the changelog for "sql/share/english/errmsg.txt"
  for instructions how to do that with other languages, 
  even at the customer site, and for the restrictions to keep.

  sql/share/english/errmsg.txt@1.70.35.1, 2007-07-26 12:49:50+02:00, joerg@debian.(none) +3 -3
    The embedded server uses absolute path names in its error messages,
    in the release build environment these exceed the 64 character limit
    which the format strings for the error messages impose (bug#16635).
    
    But when the messages are output, the server does the "printf()" 
    internally in a 256 character buffer; the constant text and the
    expanded variables (strings, error number) must fit into this.
    
    (If the buffer would overflow, a format specification will not be
    expanded but just copied with its code, and the message output
    will just contain '%s' or '%d' where a value is expected.)
    
    So the string lengths are increased to 150 characters in those messages
    which are issued by the embedded server during release tests
    and contain 1 (one) path name,
    but only to 107 in the "rename" message which contains 2 (two).
    
    This solves bug#16635 for the release builds.
    
    For other languages used by OEM customers, similar fixes may be needed,
    but we cannot test them.
    
    These fixes can be done even in a binary installation at the customer site
    by following these steps:
       cd <<install-root>>/share
       $EDITOR <<lang>>/errmsg.txt
       ../../bin/comp_err -C./charsets/ <<lang>>/errmsg.txt <<lang>>/errmsg.sys
    and then restarting the server.

ChangeSet@1.1810.3193.1, 2007-07-26 11:31:10+03:00, gkodinov@magare.gmz +3 -0
  Bug #29571: INSERT DELAYED IGNORE written to binary log on 
   the master but on the slave
  
  MySQL can decide to "downgrade" a INSERT DELAYED statement
  to normal insert in certain situations.
  One such situation is when the slave is replaying a 
  replication feed.
  However INSERT DELAYED is logged even if there're no updates
  whereas the NORMAL INSERT is not logged in such cases.
  
  Fixed by always logging a "downgraded" INSERT DELAYED: even 
  if there were no updates.

  mysql-test/r/rpl_insert_delayed.result@1.1.1.1, 2007-07-26 11:31:09+03:00, gkodinov@magare.gmz +20 -0
    Bug #29571: test case

  mysql-test/t/rpl_insert_delayed.test@1.1.1.1, 2007-07-26 11:31:09+03:00, gkodinov@magare.gmz +29 -0
    Bug #29571: test case

  sql/sql_insert.cc@1.146.63.1, 2007-07-26 11:31:09+03:00, gkodinov@magare.gmz +6 -3
    Bug #29571: log INSERT DELAYED even if it was 
    "downgraded" to INSERT (and there were no updates)

ChangeSet@1.2529.34.7, 2007-07-26 13:07:01+05:00, ramil@mysql.com +1 -0
  Fix for bug #29980: 5.1.20 ate my table
  
  Problem: trying to repair an old (e.g. with "old" varstring fields) corrupted 
  table with use_frm option we don't actually repair the table, just altering it
  which may couse data loss.
  
  Fix: if use_frm repair option is set, do repair instead of altering even 
  if the table needs upgrade.

  sql/sql_table.cc@1.439.1.2, 2007-07-26 13:06:59+05:00, ramil@mysql.com +2 -1
    Fix for bug #29980: 5.1.20 ate my table

ChangeSet@1.1810.2871.42, 2007-07-25 17:22:52-07:00, acurtis@xiphis.org +1 -0
  fix pushbuild failures

  sql/ha_federated.cc@1.24.29.1, 2007-07-25 17:22:50-07:00, acurtis@xiphis.org +1 -0
    remote_error_number is set to -1 when an error was already reported
    with my_error(). ER(-1) will also cause a crash on 64bit arch and only
    worked on 32bit arch by luck

ChangeSet@1.2536.4.8, 2007-07-26 04:41:48+05:00, gshchepa@gleb.loc +2 -0
  table.cc, sql_select.cc:
    Post-merge fix.

  sql/sql_select.cc@1.544.1.3, 2007-07-26 04:41:01+05:00, gshchepa@gleb.loc +1 -1
    Post-merge fix.

  sql/table.cc@1.298.1.3, 2007-07-26 04:41:16+05:00, gshchepa@gleb.loc +1 -1
    Post-merge fix.

ChangeSet@1.2536.4.7, 2007-07-26 04:08:58+05:00, gshchepa@gleb.loc +1 -0
  sql_select.cc:
    Post-merge fix.

  sql/sql_select.cc@1.544.1.2, 2007-07-26 04:05:41+05:00, gshchepa@gleb.loc +2 -2
    Post-merge fix.

ChangeSet@1.2536.16.1, 2007-07-25 16:01:43-07:00, antony@pcg5ppc.xiphis.org +1 -0
  Bug#29522
    "log.cc:1448: failed assertion `mysql_bin_log.is_open() && rex_data->empty()'"
    When Federated's transaction support was disabled by bug29875,
    this assertion became unreproducable.

  mysql-test/t/disabled.def@1.276, 2007-07-25 16:01:38-07:00, antony@pcg5ppc.xiphis.org +0 -1
    bug29522
      reenable federated_innodb test

ChangeSet@1.1810.3190.3, 2007-07-25 22:29:53+02:00, gbichot@production.mysql.com +1 -0
  tmp_table_size is not about user-created temporary tables, only
  internal ones (like those of GROUP BY): fixing the --help text.

  sql/mysqld.cc@1.439.1.180, 2007-07-25 22:29:50+02:00, gbichot@production.mysql.com +2 -1
    tmp_table_size is not about user-created temporary tables, only
    internal ones (like those of GROUP BY)

ChangeSet@1.2536.12.6, 2007-07-25 14:06:18-06:00, tsmith@ramayana.hindu.god +1 -0
  lock0iter.c:
    remove unused variable "bit_no"

  storage/innobase/lock/lock0iter.c@1.2, 2007-07-25 14:06:11-06:00, tsmith@ramayana.hindu.god +0 -1
    remove unused variable "bit_no"

ChangeSet@1.2536.15.1, 2007-07-25 13:29:57-06:00, tsmith@ramayana.hindu.god +4 -0
  Apply snapshot innodb-51-ss1644: Part #2.
  
  I forgot to check in some new files: lock0priv.h lock0priv.ic lock0iter.c lock0iter.h

  storage/innobase/include/lock0iter.h@1.1, 2007-07-25 13:28:03-06:00, tsmith@ramayana.hindu.god +52 -0
    BitKeeper file /home/tsmith/m/bk/inno/jul24/51/storage/innobase/include/lock0iter.h

  storage/innobase/include/lock0iter.h@1.0, 2007-07-25 13:28:03-06:00, tsmith@ramayana.hindu.god +0 -0

  storage/innobase/include/lock0priv.h@1.1, 2007-07-25 13:28:03-06:00, tsmith@ramayana.hindu.god +101 -0
    BitKeeper file /home/tsmith/m/bk/inno/jul24/51/storage/innobase/include/lock0priv.h

  storage/innobase/include/lock0priv.h@1.0, 2007-07-25 13:28:03-06:00, tsmith@ramayana.hindu.god +0 -0

  storage/innobase/include/lock0priv.ic@1.1, 2007-07-25 13:28:03-06:00, tsmith@ramayana.hindu.god +32 -0
    BitKeeper file /home/tsmith/m/bk/inno/jul24/51/storage/innobase/include/lock0priv.ic

  storage/innobase/include/lock0priv.ic@1.0, 2007-07-25 13:28:03-06:00, tsmith@ramayana.hindu.god +0 -0

  storage/innobase/lock/lock0iter.c@1.1, 2007-07-25 13:28:03-06:00, tsmith@ramayana.hindu.god +91 -0
    BitKeeper file /home/tsmith/m/bk/inno/jul24/51/storage/innobase/lock/lock0iter.c

  storage/innobase/lock/lock0iter.c@1.0, 2007-07-25 13:28:03-06:00, tsmith@ramayana.hindu.god +0 -0

ChangeSet@1.1810.2871.41, 2007-07-25 12:23:24-07:00, acurtis@xiphis.org +4 -0
  Bug#25679
    "Federated Denial of Service"
    Federated storage engine used to attempt to open connections within
    the ::create() and ::open() methods which are invoked while LOCK_open
    mutex is being held by mysqld. As a result, no other client sessions
    can open tables while Federated is attempting to open a connection.
    Long DNS lookup times would stall mysqld's operation and a rogue
    connection string which connects to a remote server which simply
    stalls during handshake can stall mysqld for a much longer period of
    time.
    This patch moves the opening of the connection much later, when the
    federated actually issues queries, by which time the LOCK_open mutex is
    no longer being held.

  mysql-test/r/federated.result@1.25.10.1, 2007-07-25 12:23:14-07:00, acurtis@xiphis.org +6 -5
    change of test/results due to patch for bug25679

  mysql-test/t/federated.test@1.19.8.1, 2007-07-25 12:23:14-07:00, acurtis@xiphis.org +6 -3
    change of test/results due to patch for bug25679

  sql/ha_federated.cc@1.24.28.1, 2007-07-25 12:23:14-07:00, acurtis@xiphis.org +140 -155
    bug25679
      remove function check_foreign_fata_source()
      ha_federated::open() no longer opens the federated connection.
      ha_federated::create() no longer opens and tests connection.
      ha_federated::real_connect() opens connection and tests presence of table.
      ha_federated::real_query() sends query, calling real_connect() if neccessary.

  sql/ha_federated.h@1.18.7.1, 2007-07-25 12:23:14-07:00, acurtis@xiphis.org +2 -0
    bug25679
      new methods real_query() and real_connect()

ChangeSet@1.2536.14.2, 2007-07-25 13:33:39-04:00, iggy@amd64.(none) +2 -0
  Bug#24732 Executables do not include Vista manifests
  - Required manual merge.

  CMakeLists.txt@1.35, 2007-07-25 13:33:37-04:00, iggy@amd64.(none) +32 -6
    Bug#24732 Executables do not include Vista manifests
    - Search for additional tools necessary to embed, catalog and sign
    targets.

  win/README@1.12, 2007-07-25 13:33:37-04:00, iggy@amd64.(none) +3 -1
    Bug#24732 Executables do not include Vista manifests
    - Add internal only note to EMBED_MANIFESTS option.

ChangeSet@1.1810.3190.2, 2007-07-25 13:18:12-04:00, iggy@amd64.(none) +5 -0
  Bug#24732 Executables do not include Vista manifests
  - Sign executables with MySQL AB security certificate.

  win/README@1.1.4.1, 2007-07-25 13:18:10-04:00, iggy@amd64.(none) +2 -1
    Bug#24732 Executables do not include Vista manifests
    - Add internal only note to EMBED_MANIFESTS option.

  BitKeeper/etc/ignore@1.210.1.42, 2007-07-25 13:18:10-04:00, iggy@amd64.(none) +1 -0
    Bug#24732 Executables do not include Vista manifests
    - Ignore security catalog descriptions

  CMakeLists.txt@1.1.26.1, 2007-07-25 13:18:10-04:00, iggy@amd64.(none) +32 -6
    Bug#24732 Executables do not include Vista manifests
    - Search for additional tools necessary to embed, catalog and sign
    targets.

  win/create_manifest.js@1.5, 2007-07-25 13:18:10-04:00, iggy@amd64.(none) +1 -1
    Bug#24732 Executables do not include Vista manifests
    - Added publicKeyToken attribute to manifest.

  win/mysql_manifest.cmake@1.3, 2007-07-25 13:18:10-04:00, iggy@amd64.(none) +4 -3
    Bug#24732 Executables do not include Vista manifests
    - Add additional commands to create security catalog and sign 
    targets.
    - Add parameters to add appropiate hash attribute to manifest
    and create security content description of the security catalog.

ChangeSet@1.1810.3189.4, 2007-07-25 19:46:50+04:00, anozdrin@ibm. +6 -0
  Patch inspired by BUG#10491: Server returns data as charset
  binary SHOW CREATE TABLE or SELECT FROM I_S.
  
  The problem is that mysqldump generates incorrect dump for a table
  with non-ASCII column name if the mysqldump's character set is
  ASCII.
  
  The fix is to:
    1. Switch character_set_client for the mysqldump's connection
    to binary before issuing SHOW CREATE TABLE statement in order
    to avoid conversion.
    
    2. Dump switch character_set_client statements to UTF8 and back
    for CREATE TABLE statement.

  client/mysqldump.c@1.214.26.1, 2007-07-25 19:46:48+04:00, anozdrin@ibm. +27 -3
    1. Switch character_set_client for the mysqldump's connection
    to binary before issuing SHOW CREATE TABLE statement in order
    to avoid conversion.
    
    2. Dump switch character_set_client statements to UTF8 and back
    for CREATE TABLE statement.

  mysql-test/r/mysqldump-max.result@1.2.1.4, 2007-07-25 19:46:48+04:00, anozdrin@ibm. +36 -0
    Update result file.

  mysql-test/r/mysqldump.result@1.83.19.1, 2007-07-25 19:46:48+04:00, anozdrin@ibm. +180 -0
    Update result file.

  mysql-test/r/openssl_1.result@1.18.1.4, 2007-07-25 19:46:48+04:00, anozdrin@ibm. +9 -0
    Update result file.

  mysql-test/r/show_check.result@1.75.1.11, 2007-07-25 19:46:48+04:00, anozdrin@ibm. +20 -0
    Update result file.

  mysql-test/t/show_check.test@1.54.1.12, 2007-07-25 19:46:48+04:00, anozdrin@ibm. +57 -0
    Test case:
      - create a table with non-ASCII column name;
      - dump the database by mysqldump using ASCII character set;
      - drop the database;
      - load the dump;
      - check that the table has been re-created properly.

ChangeSet@1.2529.41.1, 2007-07-25 19:56:17+05:00, svoj@mysql.com +5 -0
  BUG#29806 - binlog_innodb.test creates a server log
  
  Stopping mysql server could result in an entry in mysql error
  file: "InnoDB: Error: MySQL is freeing a thd".
  
  This happened because InnoDB assumes that the server will never
  call external_lock(F_UNLCK) in case external_lock(READ/WRITE)
  failed.
  
  Prior to this patch we haven't had strict definition whether
  external_lock(F_UNLCK) must be called in case external_lock(READ/WRITE)
  fails.
  
  This patch states that we never call external_lock(F_UNLCK) in case
  external_lock(READ/WRITE) fails.

  mysql-test/suite/binlog/t/disabled.def@1.3, 2007-07-25 19:56:13+05:00, svoj@mysql.com +0 -3
    Re-enabled binlog_innodb and binlog_killed tests.

  sql/ha_ndbcluster.cc@1.464.1.1, 2007-07-25 19:56:13+05:00, svoj@mysql.com +6 -0
    Restore handler state in case external_lock() failed.

  sql/ha_partition.cc@1.92.1.7, 2007-07-25 19:56:14+05:00, svoj@mysql.com +14 -1
    Do not call external_lock(F_UNLCK) in case external_lock(READ/WRITE) failed.

  sql/lock.cc@1.110.1.1, 2007-07-25 19:56:14+05:00, svoj@mysql.com +7 -1
    Do not call external_lock(F_UNLCK) in case external_lock(READ/WRITE) failed.

  storage/myisammrg/myrg_locking.c@1.12, 2007-07-25 19:56:14+05:00, svoj@mysql.com +8 -0
    Restore handler state in case external_lock() failed.

ChangeSet@1.1810.3189.3, 2007-07-25 18:38:52+04:00, anozdrin@ibm. +1 -0
  Allow mysql.proc to have extra (unknown) fields.
  This allows 5.0 to work with 5.1 databases.

  sql/sp.cc@1.82.1.53, 2007-07-25 18:38:48+04:00, anozdrin@ibm. +2 -2
    Allow mysql.proc to have extra (unknown) fields.
    This allows 5.0 to work with 5.1 databases.

ChangeSet@1.2536.13.1, 2007-07-25 12:15:29+02:00, Kristofer.Pettersson@naruto. +1 -0
  Fix of build errors for windows.

  server-tools/instance-manager/parse_output.cc@1.24, 2007-07-25 12:15:18+02:00, Kristofer.Pettersson@naruto. +2 -2
    * Fixed merge error: retval -> op_status
    * Fixed warning: unsigned compared with signed.

ChangeSet@1.2536.11.6, 2007-07-25 13:31:46+04:00, anozdrin@ibm. +2 -0
  Temporary enable IM tests in 5.1-runtime tree.
  Enable assert in Thread_registry.

  mysql-test/t/disabled.def@1.274.2.1, 2007-07-25 13:31:44+04:00, anozdrin@ibm. +12 -8
    Temporary enable IM tests in the team tree.

  server-tools/instance-manager/thread_registry.cc@1.22, 2007-07-25 13:31:44+04:00, anozdrin@ibm. +1 -2
    Uncomment assert.

ChangeSet@1.2536.10.2, 2007-07-25 10:44:45+02:00, jperkin@production.mysql.com +1 -0
  Fix for bug#29641 - $CC on Open Server is set to contain arguments
  for enabling threads.  However, duplicate AC_PROG_* macros in the
  innobase plug.in file were resetting $CC and causing link errors.
  
  As AC_PROG_* macros are already used in the main configure.in file
  there should be no need for them to be duplicated here too.

  storage/innobase/plug.in@1.8, 2007-07-25 10:33:42+02:00, jperkin@production.mysql.com +0 -4
    Remove AC_PROG_* macros

ChangeSet@1.2529.40.1, 2007-07-25 09:43:49+02:00, thek@adventure.(none) +7 -0
  Bug#28641 CREATE EVENT with '2038.01.18 03:00:00' let server crash.
  
  Creating an EVENT to be executed at a time close to the end of the allowed
  range (2038.01.19 03:14:07 UTC) would cause the server to crash. The
  expected behavior is to accept all calendar times within the interval and
  reject all other values without crashing.
  
  This patch replaces the function 'sec_to_epoch_TIME' with a Time_zone API call.
  This function was broken because it invoked the internal function 'sec_to_epoch'
  without respecting the restrictions on the function parameters (and this caused
  assertion failure). It also was used as a reverse function to
  Time_zone_utc::gmt_sec_to_TIME which it isn't.

  mysql-test/r/events_bugs.result@1.38.1.1, 2007-07-25 09:43:47+02:00, thek@adventure.(none) +7 -0
    Added test case

  mysql-test/t/events_bugs.test@1.35, 2007-07-25 09:43:47+02:00, thek@adventure.(none) +15 -0
    Added test case

  sql/event_data_objects.cc@1.108, 2007-07-25 09:43:47+02:00, thek@adventure.(none) +5 -4
    Replaced function 'sec_since_epoch_TIME' since it was implemented as
    a wrapper around 'sec_since_epoch' without taking parameter restrictions
    into account. The function was used to load information about event
    execution time from mysql.events table. Further more, the function wasn't
    the inverse function of Time_zone_utc::gmt_sec_to_TIME() which was used
    by events code to store information about event execution time.

  sql/event_db_repository.cc@1.33, 2007-07-25 09:43:47+02:00, thek@adventure.(none) +4 -4
    Replaced my_tz_UTC object with my_tz_OFFSET0 object because the first one
    doesn't supply us with a bijective MYSQL_TIME<->my_time_t translation. Instead
    the function sec_since_epoch_TIME was used as a reverse function to the method
    my_tz_UTC::gmt_sec_to_TIME. 

  sql/event_queue.cc@1.37, 2007-07-25 09:43:47+02:00, thek@adventure.(none) +1 -1
    Replaced my_tz_UTC object with my_tz_OFFSET0 object because the first one
    doesn't supply us with a bijective MYSQL_TIME<->my_time_t translation. Instead
    the function sec_since_epoch_TIME was used as a reverse function to the method
    my_tz_UTC::gmt_sec_to_TIME. 

  sql/tztime.cc@1.57, 2007-07-25 09:43:47+02:00, thek@adventure.(none) +2 -13
    * Remove function 'sec_since_epoch_TIME' since it was implemented as
    a wrapper around 'sec_since_epoch' without taking parameter restrictions
    into account. The function was used to load information about event
    execution time from mysql.events table. Further more, the function wasn't
    the inverse function of Time_zone_utc::gmt_sec_to_TIME() which was used
    by events code to store information about event execution time.
    
    * Added static Time_zone object for UTC+0 time zone.

  sql/tztime.h@1.24, 2007-07-25 09:43:47+02:00, thek@adventure.(none) +1 -0
    Include extern pointer to static Time_zone object.

ChangeSet@1.1810.3191.1, 2007-07-24 21:31:25-07:00, omer@linux.site +21 -0
  Updated/fixed test and result files to 5.0.46
  Note datadict files do not include wrong is_updatable wrong value 
       as a result of bug 30020.

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@1.1.2.1, 2007-07-24 21:31:21-07:00, omer@linux.site +6 -9
    Updated test file 

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.1.2.1, 2007-07-24 21:31:21-07:00, omer@linux.site +2 -1
    Updated test file

  mysql-test/suite/funcs_1/r/innodb_func_view.result@1.1.2.1, 2007-07-24 21:31:21-07:00, omer@linux.site +2333 -2421
    Updated test file

  mysql-test/suite/funcs_1/r/innodb_trig_0102.result@1.1.1.1, 2007-07-24 21:31:21-07:00, omer@linux.site +1 -1
    Updated test file

  mysql-test/suite/funcs_1/r/innodb_trig_08.result@1.1.2.1, 2007-07-24 21:31:21-07:00, omer@linux.site +2 -3
    Updated test file

  mysql-test/suite/funcs_1/r/innodb_trig_09.result@1.1.1.1, 2007-07-24 21:31:21-07:00, omer@linux.site +1 -1
    Updated test file

  mysql-test/suite/funcs_1/r/innodb_views.result@1.1.2.1, 2007-07-24 21:31:21-07:00, omer@linux.site +2 -1
    Updated test file

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.1.2.1, 2007-07-24 21:31:21-07:00, omer@linux.site +2 -1
    Updated test file

  mysql-test/suite/funcs_1/r/memory_func_view.result@1.1.2.1, 2007-07-24 21:31:21-07:00, omer@linux.site +2333 -2421
    Updated test file

  mysql-test/suite/funcs_1/r/memory_trig_0102.result@1.1.1.1, 2007-07-24 21:31:21-07:00, omer@linux.site +1 -1
    Updated test file

  mysql-test/suite/funcs_1/r/memory_trig_08.result@1.1.2.1, 2007-07-24 21:31:22-07:00, omer@linux.site +2 -3
    Updated test file

  mysql-test/suite/funcs_1/r/memory_trig_09.result@1.1.1.1, 2007-07-24 21:31:22-07:00, omer@linux.site +1 -1
    Updated test file

  mysql-test/suite/funcs_1/r/memory_views.result@1.1.2.1, 2007-07-24 21:31:22-07:00, omer@linux.site +2 -1
    Updated test file

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.1.2.1, 2007-07-24 21:31:22-07:00, omer@linux.site +2 -1
    Updated test file

  mysql-test/suite/funcs_1/r/myisam_func_view.result@1.1.2.1, 2007-07-24 21:31:22-07:00, omer@linux.site +2333 -2421
    Updated test file

  mysql-test/suite/funcs_1/r/myisam_trig_0102.result@1.1.1.1, 2007-07-24 21:31:22-07:00, omer@linux.site +1 -1
    Updated test file

  mysql-test/suite/funcs_1/r/myisam_trig_08.result@1.1.2.1, 2007-07-24 21:31:22-07:00, omer@linux.site +2 -3
    Updated test file

  mysql-test/suite/funcs_1/r/myisam_trig_09.result@1.1.1.1, 2007-07-24 21:31:22-07:00, omer@linux.site +1 -1
    Updated test file

  mysql-test/suite/funcs_1/r/myisam_views.result@1.1.2.1, 2007-07-24 21:31:22-07:00, omer@linux.site +916 -916
    Updated test file

  mysql-test/suite/funcs_1/triggers/triggers_0102.inc@1.1.1.1, 2007-07-24 21:31:22-07:00, omer@linux.site +1 -1
    Updated test file 

  mysql-test/suite/funcs_1/views/func_view.inc@1.1.1.1, 2007-07-24 21:31:22-07:00, omer@linux.site +2 -1
    Updated test file 

ChangeSet@1.2536.12.3, 2007-07-24 19:34:31-06:00, tsmith@ramayana.hindu.god +25 -0
  Apply snapshot innodb-51-ss1644
  
  Fixes:
  - Bug #23710: crash_commit_before fails if innodb_file_per_table=1
  - Bug #28254: innodb crash if shutdown during innodb_table_monitor is running
  - Bug #28604: innodb_force_recovery restricts data dump
  - Bug #29097: fsp_get_available_space_in_free_extents() is capped at 4TB
  - Bug #29155: Innodb "Parallel recovery" is not prevented

  storage/innobase/Makefile.am@1.30, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +4 -1
    Apply snapshot innodb-51-ss1644
    
    Revision r1632:
    Add include/lock0priv.h to noinst_HEADERS in Makefile.am.
    
    
    
    Revision r1636:
    Move lock_get_type() from lock/lock0lock.c to include/lock0priv.ic:
    * lock0lock.c: remove lock_get_type() and include include/lock0priv.ic
    * lock0priv.h: include lock0priv.ic and add lock_get_type() prototype
    * Makefile.am: add lock0priv.ic to noinst_HEADERS
    * lock0priv.ic: introduce this new file containing the body of
      lock_get_type()
    
    This move is necessary in order to use lock_get_type() from other lock/
    source files (it's going to be used in lock/lock0iter.c).
    
    Approved by:	Heikki
    
    
    Revision r1638:
    Introduce a lock queue iterator for easy (and opaque) traversing of lock
    queues. Supports table and record lock queues via the same interface.
    
    There is only "get previous" method because currently there is no need
    for "get next" - it would be unused. Feel free to add one if needed.
    
    Approved by:	Heikki

  storage/innobase/buf/buf0buf.c@1.71, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +10 -2
    Apply snapshot innodb-51-ss1644
    
    Revision r1624:
    Fix change missed as part of Bug 15815. Use a function to check if a block
    needs to be made younger.
    
    
    Revision r1581:
    Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.

  storage/innobase/buf/buf0lru.c@1.37, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +13 -0
    Apply snapshot innodb-51-ss1644
    
    Revision r1581:
    Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.

  storage/innobase/fsp/fsp0fsp.c@1.38, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +3 -2
    Apply snapshot innodb-51-ss1644
    
    Revision r1605:
    Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
    by typecasting the variables before multiplying them, so that the result of
    the multiplication is of type "unsigned long long".
    
    I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
    use it without overwriting it with zeroes (by commenting the code that
    overwrites :newraw files).
    
    New type ullint is introduced with the sole purpose of shortening
    "unsigned long long", please do not define it to something else than
    "unsigned long long".
    
    Approved by:	Heikki

  storage/innobase/handler/ha_innodb.cc@1.351, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +19 -22
    Apply snapshot innodb-51-ss1644
    
    Revision r1605:
    Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
    by typecasting the variables before multiplying them, so that the result of
    the multiplication is of type "unsigned long long".
    
    I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
    use it without overwriting it with zeroes (by commenting the code that
    overwrites :newraw files).
    
    New type ullint is introduced with the sole purpose of shortening
    "unsigned long long", please do not define it to something else than
    "unsigned long long".
    
    Approved by:	Heikki
    
    
    Revision r1573:
    create_table_def(): Eliminate the inline function call to dict_table_is_comp()
    that was introduced in r1571.  Inlining is disabled in ha_innodb.cc.
    
    
    Revision r1574:
    innodb_check_for_record_too_big_error(): Divide the return value of
    page_get_free_space_of_empty_noninline() by 2.  Until r1571, that function
    did not return the same value as page_get_free_space_of_empty().
    
    
    Revision r1571:
    Fix a severe bug that was introduced in r1422 when fixing Bug 21101.
    When creating an index containing a too long record, InnoDB would
    dereference a NULL pointer when trying to determine the maximum row length.
    
    innodb_check_for_record_too_big_error(): Replace the dict_table_t*
    parameter with a Boolean flag.  There is not always a dict_table_t object
    when this function is called.
    
    page_get_free_space_of_empty_noninline(): Move the definition and
    declaration from row0mysql (!) to page0page.  Make the signature
    identical with page_get_free_space_of_empty().
    
    create_clustered_index_when_no_primary(): Add the parameter "comp".
    Remove unnecessary casts.

  storage/innobase/include/buf0buf.ic@1.33, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +1 -1
    Apply snapshot innodb-51-ss1644
    
    Revision r1624:
    Fix change missed as part of Bug 15815. Use a function to check if a block
    needs to be made younger.

  storage/innobase/include/fsp0fsp.h@1.14, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +1 -1
    Apply snapshot innodb-51-ss1644
    
    Revision r1605:
    Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
    by typecasting the variables before multiplying them, so that the result of
    the multiplication is of type "unsigned long long".
    
    I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
    use it without overwriting it with zeroes (by commenting the code that
    overwrites :newraw files).
    
    New type ullint is introduced with the sole purpose of shortening
    "unsigned long long", please do not define it to something else than
    "unsigned long long".
    
    Approved by:	Heikki

  storage/innobase/include/lock0lock.h@1.29, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +13 -1
    Apply snapshot innodb-51-ss1644
    
    Revision r1623:
    Fix typo in comment.
    
    
    Revision r1628:
    lock_has_to_wait() is needed in the INFORMATION_SCHEMA implementation
    in order to determine which lock is blocking which. Make it non-static
    and put its definition in include/lock0lock.h.
    
    Approved by:	Heikki (via IM)

  storage/innobase/include/mem0mem.ic@1.19, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +6 -0
    Apply snapshot innodb-51-ss1644
    
    Revision r1581:
    Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.

  storage/innobase/include/page0page.h@1.12, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +9 -0
    Apply snapshot innodb-51-ss1644
    
    Revision r1571:
    Fix a severe bug that was introduced in r1422 when fixing Bug 21101.
    When creating an index containing a too long record, InnoDB would
    dereference a NULL pointer when trying to determine the maximum row length.
    
    innodb_check_for_record_too_big_error(): Replace the dict_table_t*
    parameter with a Boolean flag.  There is not always a dict_table_t object
    when this function is called.
    
    page_get_free_space_of_empty_noninline(): Move the definition and
    declaration from row0mysql (!) to page0page.  Make the signature
    identical with page_get_free_space_of_empty().
    
    create_clustered_index_when_no_primary(): Add the parameter "comp".
    Remove unnecessary casts.

  storage/innobase/include/row0mysql.h@1.52, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +0 -13
    Apply snapshot innodb-51-ss1644
    
    Revision r1571:
    Fix a severe bug that was introduced in r1422 when fixing Bug 21101.
    When creating an index containing a too long record, InnoDB would
    dereference a NULL pointer when trying to determine the maximum row length.
    
    innodb_check_for_record_too_big_error(): Replace the dict_table_t*
    parameter with a Boolean flag.  There is not always a dict_table_t object
    when this function is called.
    
    page_get_free_space_of_empty_noninline(): Move the definition and
    declaration from row0mysql (!) to page0page.  Make the signature
    identical with page_get_free_space_of_empty().
    
    create_clustered_index_when_no_primary(): Add the parameter "comp".
    Remove unnecessary casts.

  storage/innobase/include/univ.i@1.62, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +16 -0
    Apply snapshot innodb-51-ss1644
    
    Revision r1605:
    Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
    by typecasting the variables before multiplying them, so that the result of
    the multiplication is of type "unsigned long long".
    
    I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
    use it without overwriting it with zeroes (by commenting the code that
    overwrites :newraw files).
    
    New type ullint is introduced with the sole purpose of shortening
    "unsigned long long", please do not define it to something else than
    "unsigned long long".
    
    Approved by:	Heikki
    
    
    Revision r1581:
    Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.

  storage/innobase/lock/lock0lock.c@1.80, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +9 -55
    Apply snapshot innodb-51-ss1644
    
    Revision r1631:
    Move lock_rec_find_set_bit() and lock_rec_get_prev() from
    lock/lock0lock.c to include/lock0priv.h and make them non-static.
    They will be used in lock/lock0iter.c.
    
    Approved by:	Heikki
    
    
    Revision r1636:
    Move lock_get_type() from lock/lock0lock.c to include/lock0priv.ic:
    * lock0lock.c: remove lock_get_type() and include include/lock0priv.ic
    * lock0priv.h: include lock0priv.ic and add lock_get_type() prototype
    * Makefile.am: add lock0priv.ic to noinst_HEADERS
    * lock0priv.ic: introduce this new file containing the body of
      lock_get_type()
    
    This move is necessary in order to use lock_get_type() from other lock/
    source files (it's going to be used in lock/lock0iter.c).
    
    Approved by:	Heikki
    
    
    Revision r1628:
    lock_has_to_wait() is needed in the INFORMATION_SCHEMA implementation
    in order to determine which lock is blocking which. Make it non-static
    and put its definition in include/lock0lock.h.
    
    Approved by:	Heikki (via IM)
    
    
    Revision r1629:
    Add "const" qualifiers to lock_get_type() and lock_get_mode().
    
    Approved by:	Sunny
    
    
    Revision r1626:
    Move lock_*struct structures from lock/lock0lock.c to include/lock0priv.h.
    
    This is needed in order to add more code to lock/ that uses members of
    these structures (internal to the lock module) but in a separate file,
    rather than lock0lock.c. lock0lock.c is a way too big already.
    
    Approved by:	Sunny

  storage/innobase/log/log0recv.c@1.70, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +147 -100
    Apply snapshot innodb-51-ss1644
    
    Revision r1607:
    Bug#23710
    
    At InnoDB startup consider the case where log scan went beyond checkpoint_lsn as a crash and initiate crash recovery code path.
    
    reviewed by: Heikki

  storage/innobase/mem/mem0mem.c@1.19, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +1 -0
    Apply snapshot innodb-51-ss1644
    
    Revision r1581:
    Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.

  storage/innobase/mem/mem0pool.c@1.28, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +6 -0
    Apply snapshot innodb-51-ss1644
    
    Revision r1581:
    Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.

  storage/innobase/os/os0file.c@1.132, 2007-07-24 19:27:12-06:00, tsmith@ramayana.hindu.god +1 -2
    Apply snapshot innodb-51-ss1644
    
    Revision r1613:
    Fix Bug#29155 by enabling file locking on FreeBSD.
    It has been disabled because InnoDB has refused to start on
    FreeBSD & LinuxThreads, but now it starts just fine.
    
    Approved by:	Heikki

  storage/innobase/page/page0page.c@1.35, 2007-07-24 19:27:13-06:00, tsmith@ramayana.hindu.god +12 -0
    Apply snapshot innodb-51-ss1644
    
    Revision r1571:
    Fix a severe bug that was introduced in r1422 when fixing Bug 21101.
    When creating an index containing a too long record, InnoDB would
    dereference a NULL pointer when trying to determine the maximum row length.
    
    innodb_check_for_record_too_big_error(): Replace the dict_table_t*
    parameter with a Boolean flag.  There is not always a dict_table_t object
    when this function is called.
    
    page_get_free_space_of_empty_noninline(): Move the definition and
    declaration from row0mysql (!) to page0page.  Make the signature
    identical with page_get_free_space_of_empty().
    
    create_clustered_index_when_no_primary(): Add the parameter "comp".
    Remove unnecessary casts.

  storage/innobase/rem/rem0rec.c@1.25, 2007-07-24 19:27:13-06:00, tsmith@ramayana.hindu.god +5 -1
    Apply snapshot innodb-51-ss1644
    
    Revision r1581:
    Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.

  storage/innobase/row/row0mysql.c@1.142, 2007-07-24 19:27:13-06:00, tsmith@ramayana.hindu.god +0 -22
    Apply snapshot innodb-51-ss1644
    
    Revision r1571:
    Fix a severe bug that was introduced in r1422 when fixing Bug 21101.
    When creating an index containing a too long record, InnoDB would
    dereference a NULL pointer when trying to determine the maximum row length.
    
    innodb_check_for_record_too_big_error(): Replace the dict_table_t*
    parameter with a Boolean flag.  There is not always a dict_table_t object
    when this function is called.
    
    page_get_free_space_of_empty_noninline(): Move the definition and
    declaration from row0mysql (!) to page0page.  Make the signature
    identical with page_get_free_space_of_empty().
    
    create_clustered_index_when_no_primary(): Add the parameter "comp".
    Remove unnecessary casts.

  storage/innobase/sync/sync0rw.c@1.33, 2007-07-24 19:27:13-06:00, tsmith@ramayana.hindu.god +18 -0
    Apply snapshot innodb-51-ss1644
    
    Revision r1598:
    Add some comments.
    
    Approved by:	Heikki (via IM)

  storage/innobase/sync/sync0sync.c@1.49, 2007-07-24 19:27:13-06:00, tsmith@ramayana.hindu.god +1 -0
    Apply snapshot innodb-51-ss1644
    
    Revision r1598:
    Add some comments.
    
    Approved by:	Heikki (via IM)

  storage/innobase/trx/trx0sys.c@1.42, 2007-07-24 19:27:13-06:00, tsmith@ramayana.hindu.god +10 -1
    Apply snapshot innodb-51-ss1644
    
    Revision r1581:
    Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.

  storage/innobase/trx/trx0trx.c@1.75, 2007-07-24 19:27:13-06:00, tsmith@ramayana.hindu.god +7 -5
    Apply snapshot innodb-51-ss1644
    
    Revision r1595:
    trx_commit_for_mysql(): Avoid acquiring and releasing kernel_mutex when
    trx->sess or trx_dummy_sess is non-NULL.

  storage/innobase/ut/ut0mem.c@1.33, 2007-07-24 19:27:13-06:00, tsmith@ramayana.hindu.god +2 -0
    Apply snapshot innodb-51-ss1644
    
    Revision r1581:
    Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.

ChangeSet@1.2536.9.2, 2007-07-25 01:58:12+03:00, monty@mysql.com +14 -0
  Added support for 'internal temporary tables' in HEAP tables.
  Now we don't take any mutexes when creating or dropping internal HEAP tables during SELECT.
  Change buffer sizes to size_t to make keycache 64 bit safe on platforms where sizeof(ulong) != sizeof(size_t)

  BitKeeper/etc/ignore@1.296, 2007-07-25 01:55:09+03:00, monty@mysql.com +1 -0
    added support-files/mysqld_multi.server

  include/heap.h@1.35, 2007-07-25 01:58:05+03:00, monty@mysql.com +4 -1
    Added 'internal_table' to HP_CREATE_INFO

  include/keycache.h@1.11, 2007-07-25 01:58:05+03:00, monty@mysql.com +3 -3
    Change buffer sizes to size_t to make keycache 64 bit safe

  include/my_base.h@1.107, 2007-07-25 01:58:05+03:00, monty@mysql.com +2 -0
    Added HA_OPEN_INTERNAL_TABLE to mark temporary tables that should be deleted on close

  mysys/mf_keycache.c@1.74, 2007-07-25 01:58:05+03:00, monty@mysql.com +10 -9
    Change buffer sizes to size_t to make keycache 64 bit safe

  sql/sql_select.cc@1.545, 2007-07-25 01:58:05+03:00, monty@mysql.com +2 -3
    Added HA_OPEN_INTERNAL_TABLE to mark temporary tables that should be deleted on close
    Removed not anymore needed call to delete_table()

  storage/heap/ha_heap.cc@1.116, 2007-07-25 01:58:06+03:00, monty@mysql.com +22 -10
    Added support for internal temporary tables that should be deleted on close.
    Internal tables now use dedicated open and close calls to avoid taking mutexes.
    If heap_open() failes, now delete the newly created table. (This fixes a possible memory leak)
    Remove never executed info() in create()

  storage/heap/ha_heap.h@1.56, 2007-07-25 01:58:06+03:00, monty@mysql.com +2 -0
    Added slots needed to handle internal temporary tables

  storage/heap/heapdef.h@1.21, 2007-07-25 01:58:06+03:00, monty@mysql.com +2 -0
    Protect against C++ inclusion

  storage/heap/hp_close.c@1.12, 2007-07-25 01:58:06+03:00, monty@mysql.com +2 -1
    Don't call list_delete() for internal temporary tables (They are not in the list)

  storage/heap/hp_create.c@1.29, 2007-07-25 01:58:06+03:00, monty@mysql.com +34 -19
    Added HP_SHARE ** element to heap_create() to store the SHARE of the newly created table.
    For internal temporary tables: Don't take any mutex and don't put them into the open table list.

  storage/heap/hp_open.c@1.28, 2007-07-25 01:58:06+03:00, monty@mysql.com +62 -19
    Split heap_open() into sub functions to be able to create internal temporary tables without putting them in the heap_share_list.
    Add faster open() functions for when we already know the 'share'.

  storage/heap/hp_test1.c@1.21, 2007-07-25 01:58:06+03:00, monty@mysql.com +3 -1
    Update call to heap_create()
    Initialize all keyinfo members. 

  storage/heap/hp_test2.c@1.31, 2007-07-25 01:58:06+03:00, monty@mysql.com +5 -3
    Update call to heap_create()

ChangeSet@1.1810.2871.40, 2007-07-24 10:50:28-07:00, antony@pcg5ppc.xiphis.org +1 -0
  fix compile on Windows for bug25714.c
  ---
  fix compile on Windows for bug25714.c

  tests/bug25714.c@1.2, 2007-07-24 10:50:26-07:00, antony@pcg5ppc.xiphis.org +6 -3
    fix compile on Windows

ChangeSet@1.2536.1.23, 2007-07-24 09:36:56-07:00, antony@pcg5ppc.xiphis.org +1 -0
  build bug25714 test app on Windows

  tests/CMakeLists.txt@1.9, 2007-07-24 09:36:52-07:00, antony@pcg5ppc.xiphis.org +3 -0
    build bug25714 test app on Windows

ChangeSet@1.1810.2871.39, 2007-07-24 09:32:51-07:00, antony@pcg5ppc.xiphis.org +1 -0
  build bug25714 test app on Windows

  tests/CMakeLists.txt@1.1.2.1, 2007-07-24 09:32:46-07:00, antony@pcg5ppc.xiphis.org +3 -0
    build bug25714 test app on Windows

ChangeSet@1.2536.1.20, 2007-07-24 07:23:59-07:00, antony@pcg5ppc.xiphis.org +1 -0
  post 5.0 to 5.1 merge fixes

  storage/federated/ha_federated.cc@1.107, 2007-07-24 07:23:51-07:00, antony@pcg5ppc.xiphis.org +2 -2
    post 5.0 to 5.1 merge fixes

ChangeSet@1.1810.3178.12, 2007-07-24 18:15:44+04:00, evgen@moonbone.local +3 -0
  Bug#15130: CREATE .. SELECT was denied to use advantages of the SQL_BIG_RESULT.
  
  When the SQL_BIG_RESULT flag is specified SELECT should store items from the
  select list in the filesort data and use them when sending to a client.
  The get_addon_fields function is responsible for creating necessary structures
  for that. But this function was allowed to do so only for SELECT and
  INSERT .. SELECT queries. This makes the SQL_BIG_RESULT useless for
  the CREATE .. SELECT queries.
  
  Now the get_addon_fields allows storing select list items in the filesort
  data for the CREATE .. SELECT queries.

  mysql-test/r/create.result@1.107.9.1, 2007-07-24 18:15:16+04:00, evgen@moonbone.local +13 -0
    Added a test case for the bug#15130: CREATE .. SELECT was denied to use
    advantages of the SQL_BIG_RESULT.

  mysql-test/t/create.test@1.71.6.1, 2007-07-24 18:14:35+04:00, evgen@moonbone.local +10 -0
    Added a test case for the bug#15130: CREATE .. SELECT was denied to use
    advantages of the SQL_BIG_RESULT.

  sql/filesort.cc@1.105.1.18, 2007-07-24 18:15:23+04:00, evgen@moonbone.local +2 -1
    Bug#15130: CREATE .. SELECT was denied to use advantages of the SQL_BIG_RESULT.
    Now the get_addon_fields allows storing select list items in the filesort
    data for the CREATE .. SELECT queries.

ChangeSet@1.1810.3188.1, 2007-07-23 23:35:43-07:00, antony@pcg5ppc.xiphis.org +8 -0
  Bug#25714
    "getGeneratedKeys() does not work with FEDERATED table"
    mysql_insert() expected the storage engine to update the row data
    during the write_row() operation with the value of the new auto-
    increment field. The field must be updated when only one row has
    been inserted as mysql_insert() would ignore the thd->last_insert.
    This patch implements HA_STATUS_AUTO support in ha_federated::info()
    and ensures that ha_federated::write_row() does update the row's
    auto-increment value.
    The test case was written in C as the protocol's 'id' value is
    accessible through libmysqlclient and not via SQL statements.
    mysql-test-run.pl was extended to enable running the test binary.

  mysql-test/include/have_bug25714.inc@1.1, 2007-07-23 23:35:40-07:00, antony@pcg5ppc.xiphis.org +7 -0
    New BitKeeper file ``mysql-test/include/have_bug25714.inc''

  mysql-test/include/have_bug25714.inc@1.0, 2007-07-23 23:35:40-07:00, antony@pcg5ppc.xiphis.org +0 -0

  mysql-test/mysql-test-run.pl@1.30.49.89, 2007-07-23 23:35:39-07:00, antony@pcg5ppc.xiphis.org +12 -0
    bug25714
      implement support to run C test for bug25714

  mysql-test/r/federated_bug_25714.result@1.1, 2007-07-23 23:35:40-07:00, antony@pcg5ppc.xiphis.org +56 -0
    New BitKeeper file ``mysql-test/r/federated_bug_25714.result''

  mysql-test/r/federated_bug_25714.result@1.0, 2007-07-23 23:35:40-07:00, antony@pcg5ppc.xiphis.org +0 -0

  mysql-test/r/have_bug25714.require@1.1, 2007-07-23 23:35:40-07:00, antony@pcg5ppc.xiphis.org +2 -0
    New BitKeeper file ``mysql-test/r/have_bug25714.require''

  mysql-test/r/have_bug25714.require@1.0, 2007-07-23 23:35:40-07:00, antony@pcg5ppc.xiphis.org +0 -0

  mysql-test/t/federated_bug_25714.test@1.1, 2007-07-23 23:35:40-07:00, antony@pcg5ppc.xiphis.org +47 -0
    New BitKeeper file ``mysql-test/t/federated_bug_25714.test''

  mysql-test/t/federated_bug_25714.test@1.0, 2007-07-23 23:35:40-07:00, antony@pcg5ppc.xiphis.org +0 -0

  sql/ha_federated.cc@1.24.27.1, 2007-07-23 23:35:40-07:00, antony@pcg5ppc.xiphis.org +11 -3
    bug25714
      The storage engine instance property auto_increment_value was not
      being set.
      mysql_insert() requires that the storage engine updates the row with
      the auto-increment value, especially when only inserting one row.
      Implement support for ha_federated::info(HA_STATUS_AUTO)

  tests/Makefile.am@1.23.1.10, 2007-07-23 23:35:40-07:00, antony@pcg5ppc.xiphis.org +4 -1
    bug25714
      build C test for bug

  tests/bug25714.c@1.1, 2007-07-23 23:35:40-07:00, antony@pcg5ppc.xiphis.org +68 -0
    New BitKeeper file ``tests/bug25714.c''

  tests/bug25714.c@1.0, 2007-07-23 23:35:40-07:00, antony@pcg5ppc.xiphis.org +0 -0

ChangeSet@1.2536.6.3, 2007-07-23 22:01:22-06:00, malff@weblab.(none) +2 -0
  Bug#29993 (Default value of log_output should be 'FILE', not 'TABLE')
  
  Changed the default location of the log output to LOG_FILE,
  for backward compatibility with MySQL 5.0

  mysql-test/r/log_state.result@1.5, 2007-07-23 22:01:18-06:00, malff@weblab.(none) +1 -1
    Changed the default location of the log output to LOG_FILE,
    for backward compatibility with MySQL 5.0

  sql/set_var.cc@1.244, 2007-07-23 22:01:18-06:00, malff@weblab.(none) +3 -3
    Changed the default location of the log output to LOG_FILE,
    for backward compatibility with MySQL 5.0

ChangeSet@1.1810.3184.2, 2007-07-23 16:23:35-06:00, malff@weblab.(none) +1 -0
  Bug#29959 (Non-standard bison syntax in sql_yacc.yy)
  
  In sql/sql_yacc.yy, use the %prec construct at the end of rule join_table

  sql/sql_yacc.yy@1.371.1.158, 2007-07-23 16:23:33-06:00, malff@weblab.(none) +1 -1
    In sql/sql_yacc.yy, use the %prec construct at the end of rule join_table

ChangeSet@1.2536.10.1, 2007-07-23 23:54:55+02:00, kent@mysql.com +6 -0
  Many files:
    Put back old code to check stack direction at configure time

  config/ac-macros/misc.m4@1.19, 2007-07-23 23:19:22+02:00, kent@mysql.com +23 -0
    Put back old code to check stack direction at configure time

  configure.in@1.476, 2007-07-23 23:19:22+02:00, kent@mysql.com +2 -0
    Put back old code to check stack direction at configure time

  include/config-netware.h@1.25, 2007-07-23 23:19:22+02:00, kent@mysql.com +3 -0
    Put back old code to check stack direction at configure time

  include/config-win.h@1.103, 2007-07-23 23:19:22+02:00, kent@mysql.com +2 -0
    Put back old code to check stack direction at configure time

  include/my_global.h@1.175, 2007-07-23 23:19:22+02:00, kent@mysql.com +4 -0
    Put back old code to check stack direction at configure time

  sql/sql_parse.cc@1.693.1.1, 2007-07-23 23:19:22+02:00, kent@mysql.com +5 -1
    Put back old code to check stack direction at configure time

ChangeSet@1.2536.4.5, 2007-07-23 19:09:48+03:00, gkodinov@magare.gmz +5 -0
  coding style fix : Index_hint

  sql/sql_lex.cc@1.252.1.1, 2007-07-23 19:09:45+03:00, gkodinov@magare.gmz +3 -3
    coding style fix : Index_hint

  sql/sql_lex.h@1.286.1.1, 2007-07-23 19:09:45+03:00, gkodinov@magare.gmz +7 -7
    coding style fix : Index_hint

  sql/sql_parse.cc@1.694, 2007-07-23 19:09:45+03:00, gkodinov@magare.gmz +1 -1
    coding style fix : Index_hint

  sql/table.cc@1.298.1.1, 2007-07-23 19:09:45+03:00, gkodinov@magare.gmz +2 -2
    coding style fix : Index_hint

  sql/table.h@1.178, 2007-07-23 19:09:45+03:00, gkodinov@magare.gmz +2 -2
    coding style fix : Index_hint

ChangeSet@1.2526.3.1, 2007-07-23 15:05:50+02:00, thek@adventure.(none) +6 -0
  Bug#28012 Patch : IM crashes instead of reporting an error when mysqldpath is bad
    
  On the windows platform, if an instance object failed to initialize during
  program start, the instance manager would crash.
  This could happen if an incorrect mysqld path was supplied in the 
  defaults configuration file.
  The patch prevents the program from crashing and makes it show an
  error message instead.

  mysql-test/r/im_options.result@1.6, 2007-07-23 15:05:48+02:00, thek@adventure.(none) +6 -4
    - Options have changed names.

  server-tools/instance-manager/instance.cc@1.54, 2007-07-23 15:05:48+02:00, thek@adventure.(none) +14 -22
    - Added code to verify that the instance object was initialized
      before any attempt is made to start the associated process.
    - Instance::complete_initialization method will now return TRUE
      on an error during instance initialization.

  server-tools/instance-manager/instance_options.cc@1.47, 2007-07-23 15:05:48+02:00, thek@adventure.(none) +7 -6
    - Parsed result byte sequence from executed process doesn't contain a new line
      character anymore.

  server-tools/instance-manager/parse_output.cc@1.23, 2007-07-23 15:05:48+02:00, thek@adventure.(none) +342 -63
    - 'popen' didn't behave as intended on the windows platform.
    - The function parse_output_and_get_value was completly rewritten to correct the
      error in the windows built and to be more easily maintained across platforms.
     

  server-tools/instance-manager/parse_output.h@1.8, 2007-07-23 15:05:48+02:00, thek@adventure.(none) +11 -5
    - 'popen' didn't behave as intended on the windows platform.
    - The function parse_output_and_get_value was completly rewritten to correct the
      error in the windows built and to be more easily maintained across platforms.
     

  server-tools/instance-manager/portability.h@1.14, 2007-07-23 15:05:48+02:00, thek@adventure.(none) +5 -0
    - Add more portability constants for convenience.

ChangeSet@1.1810.3187.1, 2007-07-23 06:26:57+03:00, gkodinov@magare.gmz +2 -0
  table.cc, sql_select.cc:
    Limit the fix for bug 28591 to InnoDB only

  sql/sql_select.cc@1.312.1.230, 2007-07-23 06:25:59+03:00, gkodinov@magare.gmz +1 -0
    Limit the fix for bug 28591 to InnoDB only

  sql/table.cc@1.160.52.2, 2007-07-23 06:26:30+03:00, gkodinov@magare.gmz +2 -1
    Limit the fix for bug 28591 to InnoDB only

ChangeSet@1.1810.3178.9, 2007-07-22 18:26:16-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #29611.
  If a primary key is defined over column c of enum type then 
  the EXPLAIN command for a look-up query of the form
    SELECT * FROM t WHERE c=0
  said that the query was with an impossible where condition though the
  query correctly returned non-empty result set when the table indeed 
  contained rows with error empty strings for column c. 
  
  This kind of misbehavior was due to a bug in the function 
  Field_enum::store(longlong,bool) that erroneously returned 1 if
  the the value to be stored was equal to 0. 
  Note that the method 
  Field_enum::store(const char *from,uint length,CHARSET_INFO *cs)
  correctly returned 0 if a value of the error empty string 
  was stored. 

  mysql-test/r/type_enum.result@1.27.1.6, 2007-07-22 18:26:03-07:00, igor@olga.mysql.com +24 -0
    Added a test case for bug #29661.

  mysql-test/t/type_enum.test@1.16.2.5, 2007-07-22 18:26:03-07:00, igor@olga.mysql.com +24 -0
    Added a test case for bug #29661.

  sql/field.cc@1.256.57.3, 2007-07-22 18:26:03-07:00, igor@olga.mysql.com +5 -2
    Fixed bug #29611.
    If a primary key was defined over column c of enum type then 
    the EXPLAIN command for a look-up query of the form
      SELECT * FROM t WHERE c=0
    said that the query was with an impossible where condition though the
    query correctly returned non-empty result set when the table indeed 
    contained rows with error empty strings for column c. 
    
    This kind of misbehavior was due to a bug in the function 
    Field_enum::store(longlong,bool) that erroneously returned 1 if
    the the value to be stored was equal to 0. 
    Note that the method 
    Field_enum::store(const char *from,uint length,CHARSET_INFO *cs)
    correctly returned 0 if a value of the error empty string 
    was stored. 

ChangeSet@1.1810.3174.2, 2007-07-22 01:49:41+05:00, gshchepa@gleb.loc +2 -0
  sp.test, sp.result:
    Additional test case fix for bug #29338.

  mysql-test/r/sp.result@1.170.42.2, 2007-07-22 01:48:55+05:00, gshchepa@gleb.loc +1 -0
    Additional test case fix for bug #29338.

  mysql-test/t/sp.test@1.174.42.2, 2007-07-22 01:48:38+05:00, gshchepa@gleb.loc +1 -0
    Additional test case fix for bug #29338.

ChangeSet@1.1616.3082.1, 2007-07-20 22:56:19-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #29911.
  This bug manifested itself for join queries with GROUP BY and HAVING clauses
  whose SELECT lists contained DISTINCT. It occurred when the optimizer could
  deduce that the result set would have not more than one row.
  The bug could lead to wrong result sets for queries of this type because
  HAVING conditions were erroneously ignored in some cases in the function
  remove_duplicates.   

  mysql-test/r/having.result@1.10.2.2, 2007-07-20 22:55:59-07:00, igor@olga.mysql.com +19 -0
    Added a test case for bug #29911.

  mysql-test/t/having.test@1.11.2.2, 2007-07-20 22:55:59-07:00, igor@olga.mysql.com +26 -0
    Added a test case for bug #29911.

  sql/sql_select.cc@1.216.148.4, 2007-07-20 22:55:59-07:00, igor@olga.mysql.com +1 -1
    Fixed bug #29911.
    This bug manifested itself for join queries with GROUP BY and HAVING clauses
    whose SELECT lists contained DISTINCT. It occurred when the optimizer could
    deduce that the result set would have not more than one row.
    The bug could lead to wrong result sets for queries of this type because
    HAVING conditions were erroneously ignored in some cases in the function
    remove_duplicates.   

ChangeSet@1.1810.3183.1, 2007-07-21 04:50:11+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #29788.
  After dumping triggers mysqldump copied 
  the value of the OLD_SQL_MODE variable to the SQL_MODE
  variable. If the --compact option of the mysqldump was
  not set the OLD_SQL_MODE variable had the value
  of the uninitialized SQL_MODE variable. So
  usually the NO_AUTO_VALUE_ON_ZERO option of the
  SQL_MODE variable was discarded.
  
  This fix is for non-"--compact" mode of the mysqldump,
  because mysqldump --compact never set SQL_MODE to the
  value of NO_AUTO_VALUE_ON_ZERO.
  
  The dump_triggers_for_table function has been modified
  to restore previous value of the SQL_MODE variable after
  dumping triggers using the SAVE_SQL_MODE temporary
  variable.

  client/mysqldump.c@1.214.1.55, 2007-07-21 04:49:15+05:00, gshchepa@gleb.loc +4 -3
    Fixed bug #29788.
    The dump_triggers_for_table function has been modified
    to restore previous value of the SQL_MODE variable after
    dumping triggers using the SAVE_SQL_MODE temporary
    variable.

  mysql-test/r/mysqldump.result@1.83.1.45, 2007-07-21 04:49:17+05:00, gshchepa@gleb.loc +34 -4
    Updated test case for bug #29788.

  mysql-test/t/mysqldump.test@1.76.1.45, 2007-07-21 04:49:17+05:00, gshchepa@gleb.loc +22 -0
    Updated test case for bug #29788.

ChangeSet@1.2529.29.6, 2007-07-20 14:01:37-07:00, acurtis@xiphis.org +1 -0
  silence two 'unused variable' warnings

  storage/federated/ha_federated.cc@1.105, 2007-07-20 14:01:34-07:00, acurtis@xiphis.org +3 -2
    silence two 'unused variable' warnings

ChangeSet@1.2529.37.1, 2007-07-20 11:35:19-07:00, acurtis@xiphis.org +5 -0
  Bug#29875
    "Disable transaction support in Federated storage engine"
    Minimal patch to disable Federated's transactions until they can be fixed.

  mysql-test/r/federated.result@1.45.1.1, 2007-07-20 11:35:16-07:00, acurtis@xiphis.org +22 -0
    verify that transactions are disabled

  mysql-test/t/disabled.def@1.271.4.1, 2007-07-20 11:35:16-07:00, acurtis@xiphis.org +1 -0
    bug29875
      disable federated_transactions test until Bug#29523 is resolved.

  mysql-test/t/federated.test@1.37.1.1, 2007-07-20 11:35:16-07:00, acurtis@xiphis.org +26 -0
    verify that transactions are disabled

  storage/federated/ha_federated.cc@1.104, 2007-07-20 11:35:16-07:00, acurtis@xiphis.org +12 -0
    bug29875
      Disable support for transactions until fixed.

  storage/federated/ha_federated.h@1.49.1.1, 2007-07-20 11:35:16-07:00, acurtis@xiphis.org +1 -0
    bug29875
      Disable support for transactions until fixed.

ChangeSet@1.1810.3180.1, 2007-07-20 21:05:29+03:00, gkodinov@magare.gmz +4 -0
  Bug #28591: MySQL need not sort the records in case of 
  ORDER BY primary_key on InnoDB table
  
  Queries that use an InnoDB secondary index to retrieve
  data don't need to sort in case of ORDER BY primary key
  if the secondary index is compared to constant(s).
  They can also skip sorting if ORDER BY contains both the
  the secondary key parts and the primary key parts (in
  that order).
  This is because InnoDB returns the rows in order of the
  primary key for rows with the same values of the secondary
  key columns.
  Fixed by preventing temp table sort for the qualifying 
  queries.

  mysql-test/t/innodb_mysql.test@1.3.38.1, 2007-07-20 21:05:28+03:00, gkodinov@magare.gmz +33 -0
    Bug #28591: test case

  mysql-test/r/innodb_mysql.result@1.3.19.1, 2007-07-20 21:05:28+03:00, gkodinov@magare.gmz +245 -0
    Bug #28591: test case

  sql/sql_select.cc@1.312.163.2, 2007-07-20 21:05:28+03:00, gkodinov@magare.gmz +27 -2
    Bug #28591: Use the primary key as suffix when testing
    if the key can be used for ORDER BY on supporting engines.

  sql/table.cc@1.160.51.1, 2007-07-20 21:05:28+03:00, gkodinov@magare.gmz +4 -0
    Bug #28591: can use the primary key
    as a suffix for the secondary keys

ChangeSet@1.2529.33.6, 2007-07-20 19:52:25+04:00, kostja@bodhi.(none) +2 -0
  Fix the coding style.

  sql/sql_lex.cc@1.253, 2007-07-20 19:52:21+04:00, kostja@bodhi.(none) +9 -9
    Fix the style.

  sql/sql_lex.h@1.287, 2007-07-20 19:52:21+04:00, kostja@bodhi.(none) +22 -22
    Fix the style.

ChangeSet@1.1810.3169.6, 2007-07-20 19:46:13+04:00, kostja@bodhi.(none) +1 -0
  Remove obvious comments.

  sql/sql_base.cc@1.235.1.150, 2007-07-20 19:46:11+04:00, kostja@bodhi.(none) +3 -3
    Remove obvious comments.

ChangeSet@1.1810.3179.1, 2007-07-20 14:17:15+03:00, gkodinov@magare.gmz +4 -0
  Bug #29644: alter table hangs if records locked in share mode 
  by long running transaction
  
  On Windows opened files can't be deleted. There was a special
  upgraded lock mode (TL_WRITE instead of TL_WRITE_ALLOW_READ) 
  in ALTER TABLE to make sure nobody has the table opened
  when deleting the old table in ALTER TABLE. This special mode
  was causing ALTER TABLE to hang waiting on a lock inside InnoDB.
  This special lock is no longer necessary as the server is 
  closing the tables it needs to delete in ALTER TABLE.
  Fixed by removing the special lock.
  Note that this also reverses the fix for bug 17264 that deals with
  another consequence of this special lock mode being used.

  mysql-test/t/innodb_mysql.test@1.3.37.1, 2007-07-20 14:17:14+03:00, gkodinov@magare.gmz +51 -0
    Bug #29644: test case

  mysql-test/r/innodb_mysql.result@1.3.18.1, 2007-07-20 14:17:14+03:00, gkodinov@magare.gmz +23 -0
    Bug #29644: test case

  sql/sql_base.cc@1.235.105.1, 2007-07-20 14:17:14+03:00, gkodinov@magare.gmz +0 -7
    Bug #29644: don't need a special lock mode for Win32 anymore: 
    the table is closed before the drop.

  sql/ha_innodb.cc@1.202.46.1, 2007-07-20 14:17:14+03:00, gkodinov@magare.gmz +0 -11
    Bug #29644: reverse the (now excessive) fix
    for bug 17264 (but leave the test case).

ChangeSet@1.1616.3080.3, 2007-07-20 16:05:55+05:00, holyfoot@mysql.com +1 -0
  Bug #29494 Field packet with NULL fields crashes libmysqlclient.
  
  unpack_fields() didn't expect NULL_LENGHT in the field's descriptions.
  In this case we get NULL in the resulting string so cannot use
  strdup_root to make a copy of it.
  strdup_root changed with strmake_root as it's NULL-safe

  sql-common/client.c@1.46.9.1, 2007-07-20 16:05:54+05:00, holyfoot@mysql.com +7 -7
    Bug #29494 Field packet with NULL fields crashes libmysqlclient
    
    strdup_root changed with strmake_root in unpack_fields()

ChangeSet@1.1810.3177.5, 2007-07-20 15:37:42+05:00, ramil@mysql.com +1 -0
  after-merge fixup

  mysql-test/r/innodb_mysql.result@1.3.4.24, 2007-07-20 15:37:40+05:00, ramil@mysql.com +4 -3
    after-merge fixup

ChangeSet@1.2529.34.6, 2007-07-20 15:19:37+05:00, ramil@mysql.com +1 -0
  after-merge fixup

  mysql-test/r/innodb_mysql.result@1.43.1.4, 2007-07-20 15:19:35+05:00, ramil@mysql.com +14 -1
    after-merge fixup

ChangeSet@1.2529.29.4, 2007-07-20 13:27:12+05:00, svoj@mysql.com +1 -0
  BUG#28838 - duplicate external_lock in mysql_alter_table
  Fixed wrong test case. Added lost row that appeared after fix for
  this bug.

  mysql-test/r/alter_table.result@1.84, 2007-07-20 13:27:11+05:00, svoj@mysql.com +2 -0
    Fixed wrong test case. Added lost row that appeared after fix for
    BUG#28838 - duplicate external_lock in mysql_alter_table.

ChangeSet@1.2529.36.2, 2007-07-20 11:45:08+05:00, ramil@mysql.com +1 -0
  after-merge fixup.

  mysql-test/r/federated.result@1.48, 2007-07-20 11:45:06+05:00, ramil@mysql.com +2 -0
    after-merge fixup.

ChangeSet@1.1810.3177.3, 2007-07-20 11:23:38+05:00, ramil@mysql.com +1 -0
  Fixed #29923: federated.test fails in 5.0-maint, 5.1-maint
  
  Result adjusted.

  mysql-test/r/federated.result@1.25.1.19, 2007-07-20 11:23:37+05:00, ramil@mysql.com +2 -0
    Fixed #29923: federated.test fails in 5.0-maint, 5.1-maint
      - result adjusted.

ChangeSet@1.1810.3165.3, 2007-07-19 23:06:34+02:00, df@pippilotta.erinye.com +1 -0
  BUG#20815 Errno 12 on Windows after 197 connections

  CMakeLists.txt@1.1.25.1, 2007-07-19 23:06:32+02:00, df@pippilotta.erinye.com +3 -0
    BUG#20815 Set stack size. This value is really supposed to be the linker's default. I'm not quite sure why we have to specify it manually too.

ChangeSet@1.1810.2897.76, 2007-07-20 00:06:35+04:00, evgen@moonbone.local +3 -0
  Bug#29898: Item_date_typecast::val_int doesn't reset the null_value flag.
  
  The Item_date_typecast::val_int function doesn't reset null_value flag.
  This makes all values that follows the first null value to be treated as nulls
  and led to a wrong result.
  
  Now the Item_date_typecast::val_int function correctly sets the null_value flag
  for both null and non-null values.

  mysql-test/r/cast.result@1.39.1.13, 2007-07-20 00:05:28+04:00, evgen@moonbone.local +11 -0
    Added a test case for the bug#29898:  Item_date_typecast::val_int doesn't reset
    the null_value flag.

  mysql-test/t/cast.test@1.31.1.6, 2007-07-20 00:05:09+04:00, evgen@moonbone.local +9 -0
    Added a test case for the bug#29898:  Item_date_typecast::val_int doesn't reset
    the null_value flag.

  sql/item_timefunc.cc@1.100.31.4, 2007-07-20 00:05:41+04:00, evgen@moonbone.local +1 -4
    Bug#29898: Item_date_typecast::val_int doesn't reset the null_value flag.
    Now the Item_date_typecast::val_int function correctly sets the null_value flag
    for both null and non-null values.

ChangeSet@1.2529.35.1, 2007-07-19 15:25:54-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #29910  	Sporadic test failure in status.test

  mysql-test/t/status.test@1.25, 2007-07-19 15:25:50-04:00, dkatz@damien-katzs-computer.local +2 -2
    Fixed test to correctly wait for right server process and state.

ChangeSet@1.2536.1.10, 2007-07-20 00:04:30+05:00, holyfoot@mysql.com +1 -0
  mysql_client_test fixed

  tests/mysql_client_test.c@1.246.1.2, 2007-07-20 00:04:28+05:00, holyfoot@mysql.com +1 -1
    rc assignement added

ChangeSet@1.2529.33.4, 2007-07-19 21:10:19+04:00, kostja@bodhi.(none) +1 -0
  A follow-up fix for Bug#29431 "killing an insert delayed thread causes 
  crash" in 5.1

  sql/sql_insert.cc@1.284.2.2, 2007-07-19 21:10:16+04:00, kostja@bodhi.(none) +2 -1
    Additional safety fix: do not assume we already have a share in 
    get_local_table.

ChangeSet@1.1810.3176.1, 2007-07-19 20:21:23+04:00, evgen@moonbone.local +3 -0
  Bug#29850: Wrong charset of GROUP_CONCAT result when the select employs
  a temporary table.
  
  The result string of the Item_func_group_concat wasn't initialized in the 
  copying constructor of the Item_func_group_concat class. This led to a
  wrong charset of GROUP_CONCAT result when the select employs a temporary
  table.
  
  The copying constructor of the Item_func_group_concat class now correctly
  initializes the charset of the result string.

  mysql-test/r/func_gconcat.result@1.52.1.19, 2007-07-19 20:20:41+04:00, evgen@moonbone.local +9 -0
    Added a test case for the bug#29850: Wrong charset of the GROUP_CONCAT result
    when the select employs a temporary table.

  mysql-test/t/func_gconcat.test@1.44.1.14, 2007-07-19 20:20:17+04:00, evgen@moonbone.local +11 -0
    Added a test case for the bug#29850: Wrong charset of the GROUP_CONCAT result
    when the select employs a temporary table.

  sql/item_sum.cc@1.170.1.41, 2007-07-19 20:20:54+04:00, evgen@moonbone.local +1 -0
    Bug#29850: Wrong charset of GROUP_CONCAT result when the select employs
    a temporary table.
    The copying constructor of the Item_func_group_concat class now correctly
    initializes the charset of the result string.

ChangeSet@1.2529.32.2, 2007-07-19 18:05:55+02:00, joerg@trift-lap.none +1 -0
  After-merge fix for bug#14151.

  sql/sql_partition.cc@1.114, 2007-07-19 18:05:49+02:00, joerg@trift-lap.none +1 -1
    After-merge fix for bug#14151:
    This use of "md5.h" is new in 5.1 and must be changed to "my_md5.h" as well.

ChangeSet@1.2536.2.2, 2007-07-19 20:59:11+05:00, holyfoot@mysql.com +1 -0
  test case for memory leak added

  tests/mysql_client_test.c@1.246.1.1, 2007-07-19 20:59:09+05:00, holyfoot@mysql.com +33 -0
    test case added

ChangeSet@1.2529.33.2, 2007-07-19 19:56:07+04:00, kostja@bodhi.(none) +1 -0
  A post-merge fix

  mysql-test/r/create.result@1.146.1.2, 2007-07-19 19:56:04+04:00, kostja@bodhi.(none) +16 -0
    A post-merge fix

ChangeSet@1.1810.3169.5, 2007-07-19 19:36:52+04:00, kostja@bodhi.(none) +1 -0
  Rename all references to 'Delayed_insert' instances from 'tmp' to 'di'
  for consistency.

  sql/sql_insert.cc@1.146.1.100, 2007-07-19 19:36:51+04:00, kostja@bodhi.(none) +50 -50
    Rename all references to 'Delayed_insert' instances from 'tmp' to 'di'
    for consistency.

ChangeSet@1.1810.3169.4, 2007-07-19 19:28:00+04:00, kostja@bodhi.(none) +1 -0
  A fix for Bug#29431 killing an insert delayed thread causes crash
  No test case, since the bug requires a stress case with 30 INSERT DELAYED
  threads and 1 killer thread to repeat. The patch is verified
  manually.
  Review fixes.
  
  The server that is running DELAYED inserts would deadlock itself
  or crash under high load if some of the delayed threads were KILLed
  in the meanwhile.
  
  The fix is to change internal lock acquisition order of delayed inserts
  subsystem and to ensure that
  Delayed_insert::table_list::db does not point to volatile memory in some 
  cases.
  For details, please see a comment for sql_insert.cc.

  sql/sql_insert.cc@1.146.1.99, 2007-07-19 19:27:59+04:00, kostja@bodhi.(none) +28 -8
    A fix for Bug#29431 killing an insert delayed thread causes crash
    
    1) The deadlock was caused by different lock acquisition order
    between delayed_get_table and handle_delayed_insert.
    
    delayed_get_table would:
    - acquire LOCK_delayed_create
    - create a new Delayed_insert instance
    - acquire instance mutex (di->mutex)
    - "lock the instance in memory" by 
    increasing di->locked_in_memory variable
    - start the delayed thread
    - release di->mutex
    - let the delayed thread open the delayed table
    - discover that the delayed thread was killed
    - try to unlock() the delayed insert instance in memory
    - in Delayed_insert::unlock() do
     * lock LOCK_delayed_insert
     * decrease locks_in_memory and discover it's 0
     * attempt to lock di->mutex to broadcast di->cond condition <-- deadlock
     here
    
    Meanwhile, the delayed thread would
     * lock di->mutex
     * open the table
     * get killed
     * not notice that and attempt to lock LOCK_delayed_insert
    to register itself in the delayed insert list <-- deadlock here.
    
    Simply put, delayed_get_table used to lock LOCK_delayed_insert and then 
    di->mutex, and handle_delayed_insert would lock di->mutex and then 
    LOCK_delayed_insert.
    
    Fixed by moving registration in the list of delayed insert threads from 
    handle_delayed_insert to delayed_get_table - so that now
    handle_delayed_insert doesn't need to acquire LOCK_delayed_insert mutex.
    
    
    2) di->table_list.db was copied by-pointer from table_list.db of the first
    producer -- the one who initiated creation of the delayed insert thread.
    This producer might be long gone when the member is needed
    (handle_delayed_insert:open_ltable),
    e.g. by having been killed with KILL CONNECTION statement.
    Fixed by using a pointer to the consumer's deep copy of THD::db.
    
    3) In find_handler, we shouldn't assume that Delayed_insert object
    already (or still) has a table opened all the time it is
    present in the delayed insert list. E.g. it's not the case
    when Delayed_insert decided to terminate, closed the table, but haven't
    yet unregistered from the list (see the end of handle_delayed_insert).

ChangeSet@1.1810.3174.1, 2007-07-19 18:39:01+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #29338.
  Optimization of queries with DETERMINISTIC functions in the
  WHERE clause was not effective: sequential scan was always
  used.
  Now a SF with the DETERMINISTIC flags is treated as constant
  when it's arguments are constants (or a SF doesn't has arguments).

  mysql-test/r/sp.result@1.170.42.1, 2007-07-19 18:38:52+05:00, gshchepa@gleb.loc +32 -1
    Updated test case for bug #29338.

  mysql-test/t/sp.test@1.174.42.1, 2007-07-19 18:38:52+05:00, gshchepa@gleb.loc +31 -1
    Updated test case for bug #29338.

  sql/item_func.cc@1.270.1.82, 2007-07-19 18:38:50+05:00, gshchepa@gleb.loc +10 -0
    Fixed bug #29338.
    The Item_func_sp::update_used_tables and the
    Item_func_sp::fix_field functions have been modified
    to take into account the DETERMINISTIC flag of SF definition.

  sql/item_func.h@1.136.2.36, 2007-07-19 18:38:47+05:00, gshchepa@gleb.loc +1 -1
    Fixed bug #29338.
    The Item_func_sp::used_tables has been removed
    (virtual Item_func::used_tables function is enough).
    The virtual Item_func_sp::update_used_tables function
    has been added.

ChangeSet@1.1810.3173.1, 2007-07-19 14:14:03+02:00, joerg@trift-lap.none +8 -0
  Avoid the name conflict between the system-provided "md5.h" and the MySQL one
  by renaming "include/md5.h" to "include/my_md5.h".
  
  Fixes bug#14151.

  os2/MySQL-Source.icc@1.5.1.1, 2007-07-19 14:13:01+02:00, joerg@trift-lap.none +1 -1
    Avoid the name conflict between the system-provided "md5.h" and the MySQL one
    by renaming "include/md5.h" to "include/my_md5.h".
    
    Fixes bug#14151.

  client/mysqlmanager-pwgen.c@1.12.2.1, 2007-07-19 14:13:01+02:00, joerg@trift-lap.none +1 -1
    Avoid the name conflict between the system-provided "md5.h" and the MySQL one
    by renaming "include/md5.h" to "include/my_md5.h".
    
    Fixes bug#14151.

  tools/mysqlmanager.c@1.47.4.1, 2007-07-19 14:13:01+02:00, joerg@trift-lap.none +1 -1
    Avoid the name conflict between the system-provided "md5.h" and the MySQL one
    by renaming "include/md5.h" to "include/my_md5.h".
    
    Fixes bug#14151.

  include/Makefile.am@1.52.2.16, 2007-07-19 14:13:01+02:00, joerg@trift-lap.none +1 -1
    Avoid the name conflict between the system-provided "md5.h" and the MySQL one
    by renaming "include/md5.h" to "include/my_md5.h".
    
    Fixes bug#14151.

  include/my_md5.h@1.9, 2007-07-19 14:00:45+02:00, joerg@trift-lap.none +0 -0
    Rename: include/md5.h -> include/my_md5.h

  mysys/md5.c@1.10, 2007-07-19 14:13:01+02:00, joerg@trift-lap.none +1 -1
    Avoid the name conflict between the system-provided "md5.h" and the MySQL one
    by renaming "include/md5.h" to "include/my_md5.h".
    
    Fixes bug#14151.

  sql/item_strfunc.cc@1.261.1.43, 2007-07-19 14:13:01+02:00, joerg@trift-lap.none +1 -1
    Avoid the name conflict between the system-provided "md5.h" and the MySQL one
    by renaming "include/md5.h" to "include/my_md5.h".
    
    Fixes bug#14151.

  sql/table.cc@1.160.1.95, 2007-07-19 14:13:01+02:00, joerg@trift-lap.none +1 -1
    Avoid the name conflict between the system-provided "md5.h" and the MySQL one
    by renaming "include/md5.h" to "include/my_md5.h".
    
    Fixes bug#14151.

ChangeSet@1.1810.3165.2, 2007-07-19 14:12:05+02:00, dfischer@mysql.com +2 -0
  field.cc, field.h:
    i5 compatibility

  sql/field.cc@1.256.58.1, 2007-07-19 14:11:42+02:00, dfischer@mysql.com +1 -0
    i5 compatibility

  sql/field.h@1.153.33.1, 2007-07-19 14:11:39+02:00, dfischer@mysql.com +1 -1
    i5 compatibility

ChangeSet@1.2536.1.6, 2007-07-19 14:56:04+05:00, gshchepa@gleb.loc +1 -0
  mysqldump.result:
    Post-merge fix.

  mysql-test/r/mysqldump.result@1.156, 2007-07-19 14:54:12+05:00, gshchepa@gleb.loc +4 -5
    Post-merge fix.

ChangeSet@1.1810.3172.1, 2007-07-19 13:51:31+05:00, svoj@mysql.com +3 -0
  BUG#26325 - TEMPORARY TABLE "corrupt" after first read, according
              to CHECK TABLE
  
  CHECK/REPAIR TABLE reports "File not found" error when issued
  against temporary table.
  
  Fixed by disabling a brunch of code (in case it gets temporary table)
  that is responsible for updating frm version as it is not needed
  for temporary tables.

  mysql-test/r/check.result@1.6.1.1, 2007-07-19 13:51:29+05:00, svoj@mysql.com +8 -0
    A test case for BUG#26325.

  mysql-test/t/check.test@1.9.1.1, 2007-07-19 13:51:29+05:00, svoj@mysql.com +9 -0
    A test case for BUG#26325.

  sql/handler.cc@1.167.1.69, 2007-07-19 13:51:29+05:00, svoj@mysql.com +7 -1
    No need to update frm version in case table was created or checked
    by server with the same version. This also ensures that we do not
    update frm version for temporary tables as this code doesn't support
    temporary tables.

ChangeSet@1.2529.31.1, 2007-07-18 15:31:24-06:00, tsmith@ramayana.hindu.god +2 -0
  ddl_i18n_utf8.test, ddl_i18n_koi8r.test:
    Don't run test with embedded server; requires external client connections

  mysql-test/t/ddl_i18n_koi8r.test@1.3, 2007-07-18 15:31:17-06:00, tsmith@ramayana.hindu.god +2 -0
    Don't run test with embedded server; requires external client connections

  mysql-test/t/ddl_i18n_utf8.test@1.3, 2007-07-18 15:31:17-06:00, tsmith@ramayana.hindu.god +2 -0
    Don't run test with embedded server; requires external client connections

ChangeSet@1.2529.30.1, 2007-07-18 20:52:55+02:00, istruewing@chilla.local +1 -0
  Post-merge fixes
  Fixed debug code of new query cache implementation.

  sql/sql_cache.cc@1.118, 2007-07-18 20:52:50+02:00, istruewing@chilla.local +10 -2
    Post-merge fixes
    Fixed debug code of new query cache implementation.

ChangeSet@1.1810.3171.1, 2007-07-18 14:03:58-04:00, cmiller@zippy.cornsilk.net +3 -0
  Bug#26909: Specified key was too long; max key length is 255 bytes \
  	when creating table
  
  Federated tables had an artificially low maximum of key length, 
  because the handler failed to implement a method to return it and 
  the default value is taked from the prototype handler.
  
  Now, implement that method and return the maximum possible key
  length, which is that of InnoDB.

  mysql-test/r/federated.result@1.25.9.1, 2007-07-18 14:03:56-04:00, cmiller@zippy.cornsilk.net +37 -0
    Verify that unique keys may be longer than 255 characters.

  mysql-test/t/federated.test@1.19.7.1, 2007-07-18 14:03:56-04:00, cmiller@zippy.cornsilk.net +40 -0
    Verify that unique keys may be longer than 255 characters.

  sql/ha_federated.h@1.18.5.1, 2007-07-18 14:03:56-04:00, cmiller@zippy.cornsilk.net +3 -1
    Implement the virtual method that tells the max size of parts to 
    make a key.
    
    Backport the length defined in 5.1.

ChangeSet@1.2529.2.38, 2007-07-18 13:37:56-04:00, cmiller@zippy.cornsilk.net +1 -0
  Re-set the plugin name so that we can be sure the plugin init()
  function doesn't set it to something else.

  sql/sql_show.cc@1.424, 2007-07-18 13:37:54-04:00, cmiller@zippy.cornsilk.net +5 -0
    Re-set the plugin name so that we can be sure the plugin init()
    function doesn't set it to something else.

ChangeSet@1.2529.2.37, 2007-07-18 12:27:54-04:00, cmiller@zippy.cornsilk.net +1 -0
  Move the filling of the table_name column above the initialization,
  so that the init function has access to the name.

  sql/sql_show.cc@1.423, 2007-07-18 12:27:52-04:00, cmiller@zippy.cornsilk.net +1 -1
    Move the filling of the table_name column above the initialization,
    so that the init function has access to the name.

ChangeSet@1.2536.1.4, 2007-07-18 18:08:05+03:00, gkodinov@magare.gmz +2 -0
  5.0-opt -> 5.1-opt merge

  mysql-test/r/index_merge_myisam.result@1.8, 2007-07-18 18:08:02+03:00, gkodinov@magare.gmz +61 -0
    5.0-opt -> 5.1-opt merge

  storage/heap/ha_heap.cc@1.115, 2007-07-18 18:08:02+03:00, gkodinov@magare.gmz +2 -2
    5.0-opt -> 5.1-opt merge

ChangeSet@1.1810.3170.1, 2007-07-18 19:14:48+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #28524.
  For each view the mysqldump utility creates a temporary table
  with the same name and the same columns as the view 
  in order to satisfy views that depend on this view.
  After the creation of all tables, mysqldump drops all
  temporary tables and creates actual views.
  However, --skip-add-drop-table and --compact flags disable
  DROP TABLE statements for those temporary tables. Thus, it was
  impossible to create the views because of existence of the
  temporary tables with the same names.

  client/mysqldump.c@1.214.1.54, 2007-07-18 19:14:19+05:00, gshchepa@gleb.loc +1 -2
    Fixed bug #28524.
    The mysqldump utility has been modified to unconditionally drop
    temporary tables before the creation of views.

  mysql-test/r/mysqldump.result@1.83.1.44, 2007-07-18 19:14:21+05:00, gshchepa@gleb.loc +23 -10
    Updated test case for bug #28524 and updated result of previous tests.

  mysql-test/t/mysqldump.test@1.76.1.44, 2007-07-18 19:14:20+05:00, gshchepa@gleb.loc +13 -0
    Updated test case for bug #28524 and updated result of previous tests.

ChangeSet@1.2529.23.11, 2007-07-18 15:53:10+02:00, kent@mysql.com +2 -0
  CMakeLists.txt, configure.js:
    Allow to set mysqld exe suffix

  sql/CMakeLists.txt@1.41, 2007-07-18 15:52:51+02:00, kent@mysql.com +11 -9
    Allow to set mysqld exe suffix

  win/configure.js@1.9, 2007-07-18 15:52:51+02:00, kent@mysql.com +1 -0
    Allow to set mysqld exe suffix

ChangeSet@1.1810.3161.7, 2007-07-18 15:42:36+02:00, kent@mysql.com +2 -0
  CMakeLists.txt, configure.js:
    Allow to set mysqld exe suffix

  win/configure.js@1.1.6.1, 2007-07-18 15:42:09+02:00, kent@mysql.com +1 -0
    Allow to set mysqld exe suffix

  sql/CMakeLists.txt@1.1.7.1, 2007-07-18 15:42:09+02:00, kent@mysql.com +9 -7
    Allow to set mysqld exe suffix

ChangeSet@1.1810.3169.3, 2007-07-18 17:09:03+04:00, kostja@bodhi.(none) +2 -0
  Add a test case for Bug#22427 create table if not exists + stored 
  function results in inconsistent behavior.
  
  The bug itself was fixed by the patch for bug 20662.

  mysql-test/r/sp-prelocking.result@1.2.1.5, 2007-07-18 17:09:01+04:00, kostja@bodhi.(none) +22 -0
    Update results (Bug#22427)

  mysql-test/t/sp-prelocking.test@1.2.1.6, 2007-07-18 17:09:01+04:00, kostja@bodhi.(none) +23 -0
    Add a test case for Bug#22427 create table if not exists + stored 
    function results in inconsistent behavior

ChangeSet@1.1810.2897.71, 2007-07-18 15:33:41+03:00, gkodinov@magare.gmz +1 -0
  Bug #29325: create table overwrites .MYD file of other 
  table (datadir)
  Set errno when retunring an error in my_create_with_symlink.

  mysys/my_symlink2.c@1.8.1.2, 2007-07-18 15:33:39+03:00, gkodinov@magare.gmz +2 -0
    Bug #29325: set errno when retunring 
    an error in my_create_with_symlink

ChangeSet@1.1810.3169.2, 2007-07-18 16:22:05+04:00, kostja@bodhi.(none) +5 -0
  A fix and a test case for Bug#26104 Bug on foreign key class constructor.
  
  Fix the typo in the constructor. Cover a semantic check that previously
  never worked with a test.

  mysql-test/r/create.result@1.107.8.1, 2007-07-18 16:22:00+04:00, kostja@bodhi.(none) +16 -0
    Update results (Bug#26104)

  mysql-test/r/innodb.result@1.145.1.25, 2007-07-18 16:22:00+04:00, kostja@bodhi.(none) +1 -1
    Update results.

  mysql-test/t/create.test@1.71.5.1, 2007-07-18 16:22:00+04:00, kostja@bodhi.(none) +19 -0
    Add a test case for Bug#26104 Bug on foreign key class constructor

  mysql-test/t/innodb.test@1.118.2.17, 2007-07-18 16:22:00+04:00, kostja@bodhi.(none) +1 -1
    Return a new error number (MySQL error instead of internal InnoDB error).

  sql/sql_class.h@1.230.74.1, 2007-07-18 16:22:03+04:00, kostja@bodhi.(none) +1 -1
    A fix for Bug#26104 Bug on foreign key class constructor -- fix
    the typo in the constructor

ChangeSet@1.1810.3169.1, 2007-07-18 14:42:06+04:00, kostja@bodhi.(none) +2 -0
  Add a test case for Bug#27248 Triggers: error if insert affects temporary 
  table.
  The bug itself is yet another manifestation of Bug 26141.

  mysql-test/r/trigger.result@1.29.11.17, 2007-07-18 14:42:03+04:00, kostja@bodhi.(none) +28 -0
    Update results.

  mysql-test/t/trigger.test@1.34.11.18, 2007-07-18 14:42:03+04:00, kostja@bodhi.(none) +23 -0
    Add a test case for Bug#27248 Triggers: error if insert affects temporary
    table

ChangeSet@1.1810.3168.1, 2007-07-18 15:39:13+05:00, svoj@mysql.com +1 -0
  BUG#28838 - duplicate external_lock in mysql_alter_table
  
  Removed duplicate call to handler::external_lock() when
  ALTER TABLE that doesn't need to copy a table (quick
  ALTER TABLE) was executed.
  
  Also quick ALTER TABLE doesn't hold LOCK_open anymore when
  it enables/disables indexes.

  sql/sql_table.cc@1.239.60.1, 2007-07-18 15:39:11+05:00, svoj@mysql.com +1 -3
    Do not call handler::external_lock() as table is already locked
    by open_ltable().
    
    Also do not hold LOCK_open mutex for alter_table_manage_keys() as
    this function doesn't require LOCK_open (LOCK_open is required by
    wait_while_table_is_used() only).

ChangeSet@1.2529.29.1, 2007-07-18 13:55:50+05:00, svoj@mysql.com +4 -0
  BUG#29839 - lowercase_table3.test: Cannot find table test/T1 from
              the internal data dictiona
  - re-enabled lowercase_table3 test;
  - added a rule to throw away expected warning to mtr_report.pl;
  - fixed a test case to produce unique warning.

  mysql-test/lib/mtr_report.pl@1.58, 2007-07-18 13:55:49+05:00, svoj@mysql.com +5 -1
    Throw away a warning produced by BUG#29839 test.

  mysql-test/r/lowercase_table3.result@1.10, 2007-07-18 13:55:49+05:00, svoj@mysql.com +4 -4
    Modified a test case to throw away expected warning.

  mysql-test/t/disabled.def@1.271.2.5, 2007-07-18 13:55:49+05:00, svoj@mysql.com +0 -1
    Re-enabled lowercase_table3.test.

  mysql-test/t/lowercase_table3.test@1.14, 2007-07-18 13:55:49+05:00, svoj@mysql.com +3 -3
    Modified a test case to throw away expected warning.

ChangeSet@1.1810.3126.17, 2007-07-18 12:13:45+05:00, ramil@mysql.com +3 -0
  Fix for bug #28125: ERROR 2013 when adding index.
  
  Problem: we may break a multibyte char sequence using a key 
  reduced to maximum allowed length for a storage engine
  (that leads to failed assertion in the innodb code, 
  see also #17530). 
  
  Fix: align truncated key length to multibyte char boundary.

  mysql-test/t/innodb_mysql.test@1.3.35.1, 2007-07-18 12:13:44+05:00, ramil@mysql.com +9 -0
    Fix for bug #28125: ERROR 2013 when adding index.
      - test case.

  mysql-test/r/innodb_mysql.result@1.3.17.1, 2007-07-18 12:13:44+05:00, ramil@mysql.com +13 -1
    Fix for bug #28125: ERROR 2013 when adding index.
      - test result.

  sql/sql_table.cc@1.239.59.1, 2007-07-18 12:13:44+05:00, ramil@mysql.com +4 -2
    Fix for bug #28125: ERROR 2013 when adding index.
      - align truncated key length to multibyte char boundary.
      - display real key length in bytes raising warnings.

ChangeSet@1.1810.2897.70, 2007-07-18 11:12:15+04:00, sergefp@mysql.com +1 -0
  Mark deadcode for gcov

  sql/ha_heap.cc@1.71.10.3, 2007-07-18 11:12:12+04:00, sergefp@mysql.com +2 -2
    Mark deadcode for gcov

ChangeSet@1.1810.2897.69, 2007-07-18 00:29:25+04:00, sergefp@mysql.com +2 -0
  Mark deadcode for gcov

  sql/opt_range.cc@1.159.1.90, 2007-07-18 00:29:20+04:00, sergefp@mysql.com +2 -2
    Mark deadcode for gcov

  sql/ha_heap.cc@1.71.10.2, 2007-07-18 00:29:20+04:00, sergefp@mysql.com +1 -1
    Mark deadcode for gcov

ChangeSet@1.1810.2897.68, 2007-07-17 22:46:51+04:00, sergefp@mysql.com +1 -0
  Small comments fix

  sql/opt_range.cc@1.159.1.89, 2007-07-17 22:46:48+04:00, sergefp@mysql.com +5 -0
    Small comments fix

ChangeSet@1.1810.3167.1, 2007-07-17 14:43:56-04:00, dkatz@damien-katzs-computer.local +5 -0
  Bug #29784  YaSSL assertion failure when reading 8k key.
  
  Fixed the yassl base64 decoding to correctly allocate a maximum decoded buffer size. 

  extra/yassl/taocrypt/src/coding.cpp@1.8, 2007-07-17 14:43:44-04:00, dkatz@damien-katzs-computer.local +1 -1
    Fixed buffer allocation to compute the proper maximum decoded size: (EncodedLength * 3/4) + 3

  mysql-test/r/ssl_8k_key.result@1.1, 2007-07-17 14:43:53-04:00, dkatz@damien-katzs-computer.local +2 -0
    New BitKeeper file ``mysql-test/r/ssl_8k_key.result''
    
    Test connection to server using large SSL key.

  mysql-test/r/ssl_8k_key.result@1.0, 2007-07-17 14:43:53-04:00, dkatz@damien-katzs-computer.local +0 -0

  mysql-test/std_data/server8k-cert.pem@1.1, 2007-07-17 14:40:57-04:00, dkatz@damien-katzs-computer.local +51 -0
    BitKeeper file /Users/dkatz/50/mysql-test/std_data/server8k-cert.pem

  mysql-test/std_data/server8k-cert.pem@1.0, 2007-07-17 14:40:57-04:00, dkatz@damien-katzs-computer.local +0 -0

  mysql-test/std_data/server8k-key.pem@1.1, 2007-07-17 14:41:04-04:00, dkatz@damien-katzs-computer.local +99 -0
    BitKeeper file /Users/dkatz/50/mysql-test/std_data/server8k-key.pem

  mysql-test/std_data/server8k-key.pem@1.0, 2007-07-17 14:41:04-04:00, dkatz@damien-katzs-computer.local +0 -0

  mysql-test/t/ssl_8k_key.test@1.1, 2007-07-17 14:43:53-04:00, dkatz@damien-katzs-computer.local +6 -0
    New BitKeeper file ``mysql-test/t/ssl_8k_key.test''
    
    Test connection to server using large SSL key.

  mysql-test/t/ssl_8k_key.test@1.0, 2007-07-17 14:43:53-04:00, dkatz@damien-katzs-computer.local +0 -0

ChangeSet@1.1810.3162.4, 2007-07-17 19:27:31+02:00, joerg@trift2. +1 -0
  Handle "support-files/mysqld_multi.server.sh" like other shell scripts.
  
  Fixing bug#25486:  mysqld_multi.server.sh missing from builds

  support-files/Makefile.am@1.34.1.2, 2007-07-17 19:27:27+02:00, joerg@trift2. +4 -1
    Handle "mysqld_multi.server.sh" like other shell scripts.
    
    Fixing bug#25486.

ChangeSet@1.1810.3166.1, 2007-07-17 19:51:50+04:00, sergefp@mysql.com +3 -0
  [pb problem]: ha_heap->clone() fails on windows because of mess with
  '/' and '\' in path delimiters:
  - Fix this by creating new handler with exactly the same path line as
    was passed to ha_create/ha_open.

  sql/opt_range.cc@1.159.1.88, 2007-07-17 19:51:46+04:00, sergefp@mysql.com +8 -0
    Set thd->net.report_error on handler::clone() failure

  sql/ha_heap.cc@1.71.10.1, 2007-07-17 19:51:46+04:00, sergefp@mysql.com +20 -0
    [pb problem]: ha_heap->clone() fails on windows because of mess with
    '/' and '\' in path delimiters:
    - Fix this by creating new handler with exactly the same path line as
      was passed to ha_create/ha_open.

  sql/ha_heap.h@1.37.4.2, 2007-07-17 19:51:46+04:00, sergefp@mysql.com +1 -0
    [pb problem]: ha_heap->clone() fails on windows because of mess with
    '/' and '\' in path delimiters:
    - Fix this by creating new handler with exactly the same path line as
      was passed to ha_create/ha_open.

ChangeSet@1.1810.3162.3, 2007-07-17 16:25:32+02:00, joerg@trift2. +2 -0
  Ensure "mysql-stress-test.pl" is included in both "tar.gz" and RPM packages.
  
  Fixing bug#21023:  "mysql-stress-test.pl" missing in builds

  mysql-test/Makefile.am@1.66.1.27, 2007-07-17 16:25:29+02:00, joerg@trift2. +1 -1
    Ensure "mysql-stress-test.pl" is handled by "make install" in the "mysql-test" directory.
    
    This should get the script into the result tree of a RPM build.
    
    Fixing bug#21023.

  scripts/make_binary_distribution.sh@1.101.9.3, 2007-07-17 16:25:29+02:00, joerg@trift2. +2 -1
    Copy "mysql-test/mysql-stress-test.pl" into a binary distribution ("tar.gz" and derived formats).
    
    Fixing bug#21023.

ChangeSet@1.1810.3165.1, 2007-07-17 10:25:48+02:00, dfischer@mysql.com +1 -0
  make_binary_distribution.sh:
    BUG#29382

  scripts/make_binary_distribution.sh@1.101.10.1, 2007-07-17 10:23:31+02:00, dfischer@mysql.com +1 -0
    BUG#29382

ChangeSet@1.2529.25.5, 2007-07-17 09:52:55+02:00, istruewing@chilla.local +1 -0
  Disabled a test case that reports an error on OSX.

  mysql-test/t/disabled.def@1.271.3.2, 2007-07-17 09:52:52+02:00, istruewing@chilla.local +1 -0
    Disabled a test case that reports an error on OSX.

ChangeSet@1.2529.25.4, 2007-07-17 09:25:01+02:00, istruewing@chilla.local +2 -0
  Post-merge fixes
  Disabled test cases that produce errors in a "server log".

  mysql-test/suite/binlog/t/disabled.def@1.2, 2007-07-17 09:24:58+02:00, istruewing@chilla.local +14 -0
    Post-merge fixes
    Disabled test cases that produce errors in a "server log".

  mysql-test/suite/binlog/t/disabled.def@1.1, 2007-07-17 09:22:09+02:00, istruewing@chilla.local +0 -0
    BitKeeper file /home/mydev/mysql-5.1-axmrg/mysql-test/suite/binlog/t/disabled.def

  mysql-test/suite/binlog/t/disabled.def@1.0, 2007-07-17 09:22:09+02:00, istruewing@chilla.local +0 -0

  mysql-test/t/disabled.def@1.271.3.1, 2007-07-17 09:24:58+02:00, istruewing@chilla.local +0 -1
    Post-merge fixes
    Removed 'binlog_innodb' from the wrong disabled.def file.

ChangeSet@1.2529.24.8, 2007-07-17 01:30:57+04:00, kostja@bodhi.(none) +2 -0
  Fix a build break on 64 bit (uint and size_t are distinct types).

  sql/sql_lex.cc@1.252, 2007-07-17 01:30:49+04:00, kostja@bodhi.(none) +1 -1
    Fix a build break on 64 bit (uint and size_t are distinct types).

  sql/sql_lex.h@1.286, 2007-07-17 01:30:49+04:00, kostja@bodhi.(none) +1 -1
    Fix a build break on 64 bit (uint and size_t are distinct types).

ChangeSet@1.2529.24.6, 2007-07-17 00:59:21+04:00, kostja@bodhi.(none) +14 -0
  Post-merge fixes (merge from the main).

  mysql-test/r/innodb_mysql.result@1.43.2.2, 2007-07-17 00:59:16+04:00, kostja@bodhi.(none) +4 -48
    Update test results (merge from the main tree).

  mysql-test/r/query_cache.result@1.95, 2007-07-17 00:59:16+04:00, kostja@bodhi.(none) +1 -0
    Update test results (merge from the main tree).

  mysql-test/r/sp.result@1.279.3.2, 2007-07-17 00:59:16+04:00, kostja@bodhi.(none) +25 -25
    Update test results (merge from the main tree).

  mysql-test/t/query_cache.test@1.75, 2007-07-17 00:59:16+04:00, kostja@bodhi.(none) +3 -3
    Use --echo End of to simplify future merges.

  sql/handler.h@1.268, 2007-07-17 00:59:16+04:00, kostja@bodhi.(none) +1 -1
    st_table_list -> TABLE_LIST

  sql/item_create.cc@1.87, 2007-07-17 00:59:16+04:00, kostja@bodhi.(none) +1 -1
    A post-merge fix (this code is in sql_yacc.yy in 5.0)

  sql/rpl_utility.h@1.7, 2007-07-17 00:59:16+04:00, kostja@bodhi.(none) +1 -1
    st_table_list -> TABLE_LIST

  sql/sp.cc@1.162, 2007-07-17 00:59:16+04:00, kostja@bodhi.(none) +1 -1
    A post-merge fix.

  sql/sp_head.cc@1.282, 2007-07-17 00:59:16+04:00, kostja@bodhi.(none) +3 -3
    In 5.1 memdup_root returns void*.

  sql/sql_show.cc@1.421, 2007-07-17 00:59:17+04:00, kostja@bodhi.(none) +2 -2
    st_table_list -> TABLE_LIST

  sql/sql_show.h@1.5, 2007-07-17 00:59:17+04:00, kostja@bodhi.(none) +1 -2
    st_table_list -> TABLE_LIST

  sql/sql_yacc.yy@1.589, 2007-07-17 00:59:17+04:00, kostja@bodhi.(none) +2 -1
    A post-merge fix.

  sql/table.cc@1.298, 2007-07-17 00:59:17+04:00, kostja@bodhi.(none) +3 -3
    st_table_list -> TABLE_LIST

  sql/table.h@1.177, 2007-07-17 00:59:17+04:00, kostja@bodhi.(none) +1 -1
    st_table_list -> TABLE_LIST

ChangeSet@1.1810.3127.9, 2007-07-16 23:37:02+04:00, kostja@bodhi.(none) +1 -0
  Bug#29050 Creation of a legal stored procedure fails if a database is not 
  selected prior: ensure the fix also works for information_schema
  tables.

  sql/sql_parse.cc@1.426.1.205, 2007-07-16 23:36:58+04:00, kostja@bodhi.(none) +1 -1
    Ensure the fix for Bug#29050 works for information_schema tables.

ChangeSet@1.2529.27.1, 2007-07-16 14:53:05-04:00, dkatz@damien-katzs-computer.local +3 -0
  Bug #29692  	Single row inserts can incorrectly report a huge number of row insertions
  
  This bug was caused by unitialized value that was the result of a bad 5.0 merge.

  sql/sql_class.h@1.380.2.1, 2007-07-16 14:53:01-04:00, dkatz@damien-katzs-computer.local +16 -4
    Readded comments lost in a bad merge.

  sql/sql_insert.cc@1.281.2.1, 2007-07-16 14:53:01-04:00, dkatz@damien-katzs-computer.local +5 -4
    Fixed code to completely initialize (zero) the "COPY_INFO info" var in the same manner as the delayed write code.
    
    Readded a change that was lost in a bad merge.

  tests/mysql_client_test.c@1.247, 2007-07-16 14:53:01-04:00, dkatz@damien-katzs-computer.local +33 -0
    Test case added for bug#29692.

ChangeSet@1.2529.24.3, 2007-07-16 22:34:36+04:00, kostja@bodhi.(none) +2 -0
  Fix ndb_cache* test failures in the -runtime tree.
  Do not try to acquire structure_guard_mutex for the second time
  when invalidating a table from send_result_to_client.

  sql/sql_cache.cc@1.117, 2007-07-16 22:34:33+04:00, kostja@bodhi.(none) +25 -8
    Do not try to acquire mutex when invalidating a table
    from send_result_to_client().
    A follow up patch for the patch for Bug#21074.
    Reuse code by moving locking-independent invalidation functionality
    into invalidate_table_internal.

  sql/sql_cache.h@1.40, 2007-07-16 22:34:33+04:00, kostja@bodhi.(none) +1 -0
    Add a new declaration.

ChangeSet@1.2529.25.1, 2007-07-16 16:12:05+02:00, istruewing@chilla.local +1 -0
  Post-merge fix
  Disabled a test that reports Slave SQL error in warnings file.

  mysql-test/suite/rpl/t/disabled.def@1.6, 2007-07-16 16:12:01+02:00, istruewing@chilla.local +1 -0
    Post-merge fix
    Disabled a test that reports Slave SQL error in warnings file.

ChangeSet@1.1810.3163.1, 2007-07-16 19:08:07+05:00, holyfoot@mysql.com +1 -0
  Bug #29687 mysql_stmt_store_result memory leak in libmysqld
  
  In embedded server we use result->alloc to store field data for the
  result, but we didn't clean the result->alloc if the query returned
  an empty recordset. Cleaning for the empty recordset enabled

  libmysql/libmysql.c@1.233.17.1, 2007-07-16 19:08:05+05:00, holyfoot@mysql.com +1 -1
    Bug #29687 mysql_stmt_store_result memory leak in libmysqld
    
    we should clean result->alloc even if we have nothin in 'data' field

ChangeSet@1.2526.1.7, 2007-07-16 15:57:20+04:00, kostja@bodhi.(none) +1 -0
  A follow up after the fix for Bug#21074 - fix NDB tests breaking on
  asserts.
  The patch for Bug#21074 replaces acquisition of the global LOCK_open lock
  with exclusive locks on table names in such operations ad DROP TABLE
  and RENAME TABLE.
  Unfortunately, NDB internally assumes that LOCK_open is acquired and
  tries to release it.
  This dependency should be fixed by a separate (and significant in size)
  patch. For now we just satisfy it - after all, the original
  goal of the patch for Bug#21074 was to move query_cache_invalidate
  outside of the scope of LOCK_open, and we still can do that.
  
  This fixes some failing NDB tests in the runtime tree.

  sql/sql_rename.cc@1.46, 2007-07-16 15:57:17+04:00, kostja@bodhi.(none) +11 -1
    Move release of LOCK_open after ha_ndbcluster::rename_tables to
    satisfy an assert in ndb_log_schema_op.

ChangeSet@1.1810.3162.1, 2007-07-16 12:42:12+02:00, dfischer@mysql.com +1 -0
  Raise version number after cloning 5.0.46

  configure.in@1.245.99.1, 2007-07-16 12:42:05+02:00, dfischer@mysql.com +2 -2
    Raise version number after cloning 5.0.46

ChangeSet@1.2529.23.4, 2007-07-16 15:09:46+05:00, svoj@mysql.com +4 -0
  BUG#29807 - innodb_mysql.test: Cannot find table test/t2 from the
              internal data dictionary
  - re-enabled innodb_mysql test;
  - added a rule to through away expected warning to mtr_report.pl;
  - fixed a test case to produce unique warning.

  mysql-test/include/mix1.inc@1.41.1.1, 2007-07-16 15:09:43+05:00, svoj@mysql.com +5 -5
    Modified a test case to through away expected warning.

  mysql-test/lib/mtr_report.pl@1.57, 2007-07-16 15:09:43+05:00, svoj@mysql.com +5 -1
    Through away a warning produced by BUG#29807 test.

  mysql-test/r/innodb_mysql.result@1.43.1.1, 2007-07-16 15:09:43+05:00, svoj@mysql.com +6 -6
    Modified a test case to through away expected warning.

  mysql-test/t/disabled.def@1.271.2.3, 2007-07-16 15:09:43+05:00, svoj@mysql.com +0 -1
    Re-enabled innodb_mysql.test.

ChangeSet@1.1810.2897.66, 2007-07-16 01:03:58+04:00, evgen@moonbone.local +1 -0
  item_cmpfunc.cc:
    A typo fixed.

  sql/item_cmpfunc.cc@1.187.1.76, 2007-07-16 01:03:32+04:00, evgen@moonbone.local +1 -1
    A typo fixed.

ChangeSet@1.1810.2897.65, 2007-07-16 00:59:47+04:00, evgen@moonbone.local +1 -0
  item_cmpfunc.cc:
    Fixed compiler warning.

  sql/item_cmpfunc.cc@1.187.1.75, 2007-07-16 00:59:18+04:00, evgen@moonbone.local +1 -2
    Fixed compiler warning.

ChangeSet@1.1810.2897.64, 2007-07-15 23:40:57+04:00, evgen@moonbone.local +1 -0
  item_cmpfunc.cc:
    A comment changed.

  sql/item_cmpfunc.cc@1.187.1.74, 2007-07-15 23:39:40+04:00, evgen@moonbone.local +3 -3
    A comment changed.

ChangeSet@1.1810.2897.63, 2007-07-15 21:51:36+04:00, evgen@moonbone.local +4 -0
  Extended fix for the bug#29555.
  
  The get_time_value function is added. It is used to obtain TIME values both
  from items the can return time as an integer and from items that can return
  time only as a string.
  The Arg_comparator::compare_datetime function now uses pointer to a getter
  function to obtain values to compare. Now this function is also used for
  comparison of TIME values.
  The get_value_func variable is added to the Arg_comparator class.
  It points to a getter function for the DATE/DATETIME/TIME comparator.

  mysql-test/r/type_time.result@1.13.1.6, 2007-07-15 21:11:41+04:00, evgen@moonbone.local +6 -0
    Extended test case for the bug#29555.

  mysql-test/t/type_time.test@1.12, 2007-07-15 21:11:26+04:00, evgen@moonbone.local +4 -0
    Extended test case for the bug#29555.

  sql/item_cmpfunc.cc@1.187.1.73, 2007-07-15 21:42:46+04:00, evgen@moonbone.local +74 -7
    Extended fix for the bug#29555.
    The get_time_value function is added. It is used to obtain TIME values both
    from items the can return time as an integer and from items that can return
    time only as a string.
    The Arg_comparator::compare_datetime function now uses pointer to a getter
    function to obtain values to compare. Now this function is also used for
    comparison of TIME values.

  sql/item_cmpfunc.h@1.122.2.29, 2007-07-15 21:49:58+04:00, evgen@moonbone.local +2 -0
    Extended fix for the bug#29555.
    The get_value_func variable is added to the Arg_comparator class.
    It points to a getter function for the DATE/DATETIME/TIME comparator.

ChangeSet@1.2529.23.3, 2007-07-15 18:47:57+02:00, istruewing@chilla.local +4 -0
  Post-merge fixes
  Disabled tests which break automatic merging due to
  non-empty warnings file.

  mysql-test/suite/ndb/t/disabled.def@1.3, 2007-07-15 18:47:54+02:00, istruewing@chilla.local +1 -0
    Post-merge fixes
    Disabled tests which break automatic merging due to
    non-empty warnings file.

  mysql-test/suite/rpl/t/disabled.def@1.5, 2007-07-15 18:47:54+02:00, istruewing@chilla.local +15 -0
    Post-merge fixes
    Disabled tests which break automatic merging due to
    non-empty warnings file.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.2.1.1, 2007-07-15 18:47:54+02:00, istruewing@chilla.local +2 -0
    Post-merge fixes
    Disabled tests which break automatic merging due to
    non-empty warnings file.

  mysql-test/t/disabled.def@1.271.2.2, 2007-07-15 18:47:54+02:00, istruewing@chilla.local +2 -0
    Post-merge fixes
    Disabled tests which break automatic merging due to
    non-empty warnings file.

ChangeSet@1.1810.3127.8, 2007-07-15 13:34:35+04:00, kostja@bodhi.(none) +2 -0
  Add a teste case for Bug#27296 "Assertion in ALTER TABLE SET DEFAULT in 
  Linux Debug build (possible deadlock)"
  
  The bug is not repeatable any more.

  mysql-test/t/innodb_mysql.test@1.3.33.1, 2007-07-15 13:34:33+04:00, kostja@bodhi.(none) +14 -0
    Add a teste case for Bug#27296 "Assertion in ALTER TABLE SET DEFAULT in 
    Linux Debug build (possible deadlock)"

  mysql-test/r/innodb_mysql.result@1.3.16.1, 2007-07-15 13:34:33+04:00, kostja@bodhi.(none) +4 -0
    Update test results (Bug#27296)

ChangeSet@1.2526.1.6, 2007-07-15 13:25:38+04:00, kostja@bodhi.(none) +2 -0
  A fix for Bug#27406 Events: failure only causes a warning. Update test
  results.
  When executing a CREATE EVENT statement with ON COMPLETION NOT PRESERVE 
  clause (explicit or implicit) and completion date in the past, we do not 
  create the event. Or, put it differently, we create it and then drop 
  immediately.
  A warning is issued in this case, not an error -- we want to load 
  successfully old database dumps, and such dumps may contain events
  that are no longer valid.
  
  Update the warning text to not imply an erroneous condition. 

  mysql-test/r/events_bugs.result@1.33.1.6, 2007-07-15 13:25:35+04:00, kostja@bodhi.(none) +7 -7
    Update the test results (Bug#27406)

  sql/share/errmsg.txt@1.159.1.2, 2007-07-15 13:25:35+04:00, kostja@bodhi.(none) +2 -2
    Fix Bug#27406 "Events: failure only causes a warning" -- update the error
    message to not imply that there was a failure.

ChangeSet@1.1810.3160.2, 2007-07-14 22:43:58+04:00, evgen@moonbone.local +3 -0
  Bug#29729: Wrong conversion error led to an empty result set.
  
  The Field_newdate::store when storing a DATETIME value was returning the
  'value was cut' error even if the thd->count_cuted_fields flag is set to
  CHECK_FIELD_IGNORE. This made range optimizr think that there is no
  appropriate data in the table and thus to return an empty set.
  
  Now the Field_newdate::store function returns conversion error only if the
  thd->count_cuted_fields flag isn't set to CHECK_FIELD_IGNORE.

  mysql-test/r/type_time.result@1.13.1.5, 2007-07-14 22:43:52+04:00, evgen@moonbone.local +13 -0
    Added a test case for the bug#29729: Wrong conversion error led to an empty result set.

  mysql-test/t/type_time.test@1.11, 2007-07-14 22:43:49+04:00, evgen@moonbone.local +15 -0
    Added a test case for the bug#29729: Wrong conversion error led to an empty result set.

  sql/field.cc@1.256.57.2, 2007-07-14 22:43:53+04:00, evgen@moonbone.local +2 -1
    Bug#29729: Wrong conversion error led to an empty result set.

ChangeSet@1.1810.2897.61, 2007-07-14 22:02:10+04:00, sergefp@mysql.com +2 -0
  BUG#29740: Make the test result deterministic

  mysql-test/r/index_merge.result@1.19.3.2, 2007-07-14 22:02:07+04:00, sergefp@mysql.com +14 -14
    BUG#29740: Make the test result deterministic

  mysql-test/t/index_merge.test@1.14.2.2, 2007-07-14 22:02:07+04:00, sergefp@mysql.com +5 -0
    BUG#29740: Make the test result deterministic

ChangeSet@1.1810.3128.10, 2007-07-14 17:58:39+05:00, svoj@mysql.com +1 -0
  BUG#29734 - thread_id=0 in binary log which leads to temporary table conflicts
  
  pseudo_thread_id was reset to zero via mysql_change_user() handling
  whereas there is no reason to do that.  Moreover, having two
  concurrent threads that change user and create a namesake temp tables
  leads to recording the dup pair of queries:
  
     set @@session.pseudo_thread_id = 0;
     CREATE temporary table `the namesake`;
  
  which will stall the slave as the second instance can not be created.
  And that is the bug case.
  
  Fixed by correcting pseudo_thread_id value after mysql_change_user().

  sql/sql_class.cc@1.223.1.51, 2007-07-14 17:58:37+05:00, svoj@mysql.com +10 -1
    Fixed that pseudo_thread_id was set to 0 after mysql_change_user().

ChangeSet@1.2526.1.5, 2007-07-14 05:22:24+04:00, kostja@bodhi.(none) +1 -0
  Fix a compiler warning.

  sql/sql_trigger.cc@1.102, 2007-07-14 05:22:22+04:00, kostja@bodhi.(none) +4 -4
    Fix a compiler warning.

ChangeSet@1.2526.1.4, 2007-07-14 04:38:21+04:00, kostja@bodhi.(none) +1 -0
  Fix a warning in a non-debug build.

  sql/sql_cache.cc@1.115, 2007-07-14 04:38:19+04:00, kostja@bodhi.(none) +2 -2
    Fix a warning in a non-debug build.

ChangeSet@1.2526.1.3, 2007-07-14 02:04:48+04:00, kostja@bodhi.(none) +5 -0
  A follow up after the patch for Bug#21074 - even though
  we now have exclusive name lock on the table name in mysql_rm_table_part2,
  we still should keep LOCK_open - some storage engines are not
  ready for locking scope change and assume that LOCK_open is kept.
  Still, the binary logging and query cache invalidation calls
  moved out of LOCK_open scope.
  Fixes some of the broken 5.1-runtime tests (tests break on asserts).

  sql/ha_ndbcluster.cc@1.461.1.2, 2007-07-14 02:04:46+04:00, kostja@bodhi.(none) +2 -4
    Do not lock LOCK_open for mysql_rm_table_part2 - it does that
    for us now.

  sql/mysql_priv.h@1.523.1.3, 2007-07-14 02:04:46+04:00, kostja@bodhi.(none) +1 -2
    Remove an unused flag.

  sql/sql_class.h@1.377.2.1, 2007-07-14 02:04:46+04:00, kostja@bodhi.(none) +1 -1
    Fix an unrelated compiler warning.

  sql/sql_db.cc@1.156, 2007-07-14 02:04:46+04:00, kostja@bodhi.(none) +1 -1
    Adjust to the changed signature.

  sql/sql_table.cc@1.439, 2007-07-14 02:04:46+04:00, kostja@bodhi.(none) +18 -26
    mysql_rm_table_part2: we need to keep LOCK_open while calling
    storage engine functions, even though now 
    we have an exclusive lock on the table name. Some of them assume that it's 
    kept and attempt to unlock it.
     

ChangeSet@1.2529.2.32, 2007-07-13 22:45:05+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  correct cluster support check

  mysql-test/include/ndb_master-slave.inc@1.3, 2007-07-13 22:45:02+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    correct cluster support check

ChangeSet@1.2529.22.3, 2007-07-14 01:34:46+05:00, gshchepa@gleb.loc +2 -0
  symlink.test, symlink.result:
    Minor fix for test case of bug #29325 to make emb test happy.

  mysql-test/r/symlink.result@1.38, 2007-07-14 01:33:55+05:00, gshchepa@gleb.loc +1 -1
    Minor fix for test case of bug #29325 to make emb test happy.

  mysql-test/t/symlink.test@1.29, 2007-07-14 01:32:40+05:00, gshchepa@gleb.loc +1 -0
    Minor fix for test case of bug #29325 to make emb test happy.

ChangeSet@1.2482.8.63, 2007-07-13 22:21:19+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  avoid multiple defines of server1/2

  mysql-test/include/ndb_master-slave.inc@1.2, 2007-07-13 22:21:16+02:00, tomas@whalegate.ndb.mysql.com +6 -1
    avoid multiple defines of server1/2

  mysql-test/t/ndb_multi.test@1.18.2.1, 2007-07-13 22:21:16+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    avoid multiple defines of server1/2

  mysql-test/t/ndb_multi_row.test@1.4.2.1, 2007-07-13 22:21:16+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    avoid multiple defines of server1/2

ChangeSet@1.2529.17.3, 2007-07-14 00:13:37+05:00, ramil@mysql.com +2 -0
  Fix for bug #29253: csv table reportedly marked as crashed
  
  Problem: the data file changes made during delete/update are not visible to 
  other threads as the file is reopened, so reading data 
  with old descriptors might miss the changes.
  
  Fix: reopen the data file before reading if it was reopened during 
  delete/update to ensure there's no data behind.
  
  Note: there's no simple test case.

  storage/csv/ha_tina.cc@1.82, 2007-07-14 00:13:35+05:00, ramil@mysql.com +46 -6
    Fix for bug #29253: csv table reportedly marked as crashed
      - use the data file version technic to ensure we always see changes
        made by other threads:
          a) increase share->data_file_version each time we reopen the data 
             file, i.e. at the end of update/delete.
          b) compare the local data file version with the shared one each time 
             we want to read data, reopen it if they differ.

  storage/csv/ha_tina.h@1.32, 2007-07-14 00:13:35+05:00, ramil@mysql.com +3 -0
    Fix for bug #29253: csv table reportedly marked as crashed
      - use the data file version technic to ensure we always see changes
        made by other threads:
          a) increase share->data_file_version each time we reopen the data 
             file, i.e. at the end og update/delete.
          b) compare the local data file version with shared one each time 
             we want to read data, reopen it if they differ.

ChangeSet@1.2529.9.5, 2007-07-13 18:32:22+02:00, mleich@three.local.lan +23 -0
  Additional tests checking for symptoms observed within
    Bug28309 First insert violates unique constraint - was "memory" table empty ?
  ---
  Add missing phony targets

  Makefile.am@1.138, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +11 -3
    Add execution of the ddl stress tests.
      (modified) test-bt: Short running variant added
      (new) test-ext-stress: Longer running variant
      (modified) test-ext: test-ext-stress added
      (modified) test-fast: Short running variant with MyISAM only added
    ---
    Declare test-ext-jp and test-ext-stress to PHONY make targets.

  mysql-test/suite/stress/include/ddl.cln@1.1, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +4 -0
    Script for cleanup at execution end

  mysql-test/suite/stress/include/ddl.cln@1.0, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/include/ddl.pre@1.1, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +21 -0
    Script for general preparations at execution start

  mysql-test/suite/stress/include/ddl.pre@1.0, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/include/ddl1.inc@1.1, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +277 -0
    ddl stress script

  mysql-test/suite/stress/include/ddl1.inc@1.0, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/include/ddl2.inc@1.1, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +259 -0
    ddl stress script

  mysql-test/suite/stress/include/ddl2.inc@1.0, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/include/ddl3.inc@1.1, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +242 -0
    ddl stress script

  mysql-test/suite/stress/include/ddl3.inc@1.0, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/include/ddl4.inc@1.1, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +339 -0
    ddl stress script

  mysql-test/suite/stress/include/ddl4.inc@1.0, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/include/ddl5.inc@1.1, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +227 -0
    ddl stress script

  mysql-test/suite/stress/include/ddl5.inc@1.0, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/include/ddl6.inc@1.1, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +266 -0
    ddl stress script

  mysql-test/suite/stress/include/ddl6.inc@1.0, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/include/ddl7.inc@1.1, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +274 -0
    ddl stress script

  mysql-test/suite/stress/include/ddl7.inc@1.0, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/include/ddl8.inc@1.1, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +302 -0
    ddl stress script

  mysql-test/suite/stress/include/ddl8.inc@1.0, 2007-07-13 18:32:18+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/r/ddl_archive.result@1.1, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +79 -0
    File with expected results

  mysql-test/suite/stress/r/ddl_archive.result@1.0, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/r/ddl_csv.result@1.1, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +55 -0
    File with expected results

  mysql-test/suite/stress/r/ddl_csv.result@1.0, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/r/ddl_innodb.result@1.1, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +251 -0
    File with expected results

  mysql-test/suite/stress/r/ddl_innodb.result@1.0, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/r/ddl_memory.result@1.1, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +251 -0
    File with expected results

  mysql-test/suite/stress/r/ddl_memory.result@1.0, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/r/ddl_myisam.result@1.1, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +251 -0
    File with expected results

  mysql-test/suite/stress/r/ddl_myisam.result@1.0, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/r/ddl_ndb.result@1.1, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +216 -0
    File with expected results

  mysql-test/suite/stress/r/ddl_ndb.result@1.0, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/t/ddl_archive.test@1.1, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +51 -0
    Storage engine specific toplevel testscript

  mysql-test/suite/stress/t/ddl_archive.test@1.0, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/t/ddl_csv.test@1.1, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +51 -0
    Storage engine specific toplevel testscript

  mysql-test/suite/stress/t/ddl_csv.test@1.0, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/t/ddl_innodb.test@1.1, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +49 -0
    Storage engine specific toplevel testscript

  mysql-test/suite/stress/t/ddl_innodb.test@1.0, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/t/ddl_memory.test@1.1, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +48 -0
    Storage engine specific toplevel testscript

  mysql-test/suite/stress/t/ddl_memory.test@1.0, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/t/ddl_myisam.test@1.1, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +48 -0
    Storage engine specific toplevel testscript

  mysql-test/suite/stress/t/ddl_myisam.test@1.0, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +0 -0

  mysql-test/suite/stress/t/ddl_ndb.test@1.1, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +56 -0
    Storage engine specific toplevel testscript

  mysql-test/suite/stress/t/ddl_ndb.test@1.0, 2007-07-13 18:32:19+02:00, mleich@three.local.lan +0 -0

ChangeSet@1.1346.895.1, 2007-07-13 17:50:58+02:00, tnurnberg@sin.intern.azundris.com +2 -0
  Bug#27198: Error returns from time() are ignored
  
  gettimeofday() can fail and presumably, so can time().
  Keep an eye on it.
  
  Since we have no data on this at all so far, we just
  retry on failure (and log the event), assuming that
  this is just an intermittant failure. This might of
  course hang the threat until we succeed. Once we know
  more about these failures, an appropriate more clever
  scheme may be picked (only try so many times per thread,
  etc., if that fails, return last "good" time() we got or
  some such).  Using sql_print_information() to log as this
  probably only occurs in high load scenarios where the debug-
  trace likely is disabled (or might interfere with testing
  the effect).  No test-case as this is a non-deterministic
  issue.

  sql/mysql_priv.h@1.150.1.90, 2007-07-13 17:50:57+02:00, tnurnberg@sin.intern.azundris.com +8 -9
    Bug#27198: Error returns from time() are ignored
    
    move declarations for log.cc to before inclusion of
    sql_class.h as we now use sql_print_information() in
    there.

  sql/sql_class.h@1.111.1.81, 2007-07-13 17:50:57+02:00, tnurnberg@sin.intern.azundris.com +21 -5
    Bug#27198: Error returns from time() are ignored
    
    gettimeofday() can fail and presumably, so can time().
    Keep an eye on it.

ChangeSet@1.1810.3159.1, 2007-07-13 19:13:40+04:00, sergefp@mysql.com +4 -0
  BUG#29740: Wrong query results for index_merge/union over HEAP table.
  - return HA_KEY_SCAN_NOT_ROR flag for HASH indexes;
  - Fix ha_heap::cmp_ref() to work with BTREE index scans.

  mysql-test/r/index_merge.result@1.19.3.1, 2007-07-13 19:13:36+04:00, sergefp@mysql.com +61 -0
    BUG#29740: testcase

  mysql-test/t/index_merge.test@1.14.2.1, 2007-07-13 19:13:36+04:00, sergefp@mysql.com +43 -0
    BUG#29740: testcase

  sql/opt_range.cc@1.159.1.87, 2007-07-13 19:13:37+04:00, sergefp@mysql.com +11 -14
    BUG#29740: Fix comment about ROR scans.

  sql/ha_heap.h@1.37.4.1, 2007-07-13 19:13:36+04:00, sergefp@mysql.com +3 -5
    BUG#29740: Wrong query results for index_merge/union over HEAP table.
    - make HEAP table engine return HA_KEY_SCAN_NOT_ROR flag for HASH 
      indexes,as HASH index does not guarantee any ordering for rows
      within the hash bucket.
    - Fix BTREE indexes: make ha_heap::cmp_ref() compare the rowids in the 
      same way as ha_key_cmp() does.

ChangeSet@1.2529.2.30, 2007-07-13 16:06:12+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  update bug dependency on failing test

  mysql-test/suite/ndb/r/ndb_binlog_format.result@1.2, 2007-07-13 16:01:36+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/r/ndb_binlog_format.result -> mysql-test/suite/ndb/r/ndb_binlog_format.result

  mysql-test/suite/ndb/t/ndb_binlog_format.test@1.3, 2007-07-13 16:01:22+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/t/ndb_binlog_format.test -> mysql-test/suite/ndb/t/ndb_binlog_format.test

  mysql-test/suite/rpl_ndb/t/disabled.def@1.3, 2007-07-13 16:06:09+02:00, tomas@whalegate.ndb.mysql.com +2 -3
    update bug dependency on failing test

ChangeSet@1.1810.3142.14, 2007-07-13 16:32:29+03:00, gkodinov@magare.gmz +2 -0
  disabled the output of the full path in tesing bug 29325

  mysql-test/r/symlink.result@1.21.1.14, 2007-07-13 16:32:27+03:00, gkodinov@magare.gmz +0 -2
    disabled the output of the full path in tesing bug 29325

  mysql-test/t/symlink.test@1.17.1.9, 2007-07-13 16:32:27+03:00, gkodinov@magare.gmz +2 -0
    disabled the output of the full path in tesing bug 29325

ChangeSet@1.2482.8.60, 2007-07-13 15:30:36+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #29762 The ndbapi-examples don't work as expected due to api changes in MySQL 5.1.16]

  storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp@1.4, 2007-07-13 15:30:33+02:00, tomas@whalegate.ndb.mysql.com +7 -5
    Bug #29762 The ndbapi-examples don't work as expected due to api changes in MySQL 5.1.16]

ChangeSet@1.2482.8.59, 2007-07-13 14:31:40+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  avoid some sporadic startup issues

  mysql-test/include/have_ndb.inc@1.16.1.2, 2007-07-13 14:31:37+02:00, tomas@whalegate.ndb.mysql.com +9 -5
    avoid some sporadic startup issues

ChangeSet@1.1810.3142.13, 2007-07-13 13:56:22+03:00, gkodinov@magare.gmz +4 -0
  Bug 29325: moved the test from create_not_windows to symlink.

  mysql-test/r/create_not_windows.result@1.1.2.2, 2007-07-13 13:56:20+03:00, gkodinov@magare.gmz +0 -22
    Bug 29325: moved the test from create_not_windows to symlink.

  mysql-test/r/symlink.result@1.21.1.13, 2007-07-13 13:56:21+03:00, gkodinov@magare.gmz +24 -0
    Bug 29325: moved the test from create_not_windows to symlink.

  mysql-test/t/create_not_windows.test@1.1.1.2, 2007-07-13 13:56:21+03:00, gkodinov@magare.gmz +0 -38
    Bug 29325: moved the test from create_not_windows to symlink.

  mysql-test/t/symlink.test@1.17.1.8, 2007-07-13 13:56:21+03:00, gkodinov@magare.gmz +36 -0
    Bug 29325: moved the test from create_not_windows to symlink.

ChangeSet@1.1810.3126.15, 2007-07-13 01:55:04-04:00, dkatz@damien-katzs-computer.local +1 -0
  When opening a new connecgtion, changed mysqltest to prefer a brand new connection slot over an existing, closed slot. Fixes a problem with reused slots that can cause tests to fail. bug#29579

  client/mysqltest.c@1.155.9.106, 2007-07-13 01:55:02-04:00, dkatz@damien-katzs-computer.local +5 -5
    When opening a new connecgtion, changed mysqltest to prefer a brand new connection slot over an existing, closed slot. Fixes a problem with reused slots that can cause tests to fail.

ChangeSet@1.1810.3126.14, 2007-07-13 00:45:54-04:00, dkatz@damien-katzs-computer.local +5 -0
  Minor fixes for test failures and compiler warnings for Bug #29579.

  BitKeeper/deleted/.del-ssl_big.test@1.2, 2007-07-13 00:23:11-04:00, dkatz@damien-katzs-computer.local +0 -0
    Delete: mysql-test/t/ssl_big.test

  extra/yassl/include/yassl_int.hpp@1.11.1.9, 2007-07-13 00:45:51-04:00, dkatz@damien-katzs-computer.local +1 -1
    added comment

  extra/yassl/src/yassl_int.cpp@1.19.1.7, 2007-07-13 00:45:51-04:00, dkatz@damien-katzs-computer.local +1 -1
    Changed init order to fix a compiler warning.

  mysql-test/r/mysqltest.result@1.24.1.27, 2007-07-13 00:45:51-04:00, dkatz@damien-katzs-computer.local +1 -1
    There is no limit to connections anymore.

  mysql-test/t/mysqltest.test@1.24.1.38, 2007-07-13 00:45:51-04:00, dkatz@damien-katzs-computer.local +1 -1
    There is no limit to connections anymore.

ChangeSet@1.1810.3158.1, 2007-07-12 22:06:33-04:00, dkatz@damien-katzs-computer.local +9 -0
  Bug #29579  Clients using SSL can hang the server
  
  Added an option to yassl to allow "quiet shutdown" like openssl does. This option causes the SSL libs to NOT perform the close_notify handshake during shutdown. This fixes a hang we experience because we hold a lock during socket shutdown.

  mysql-test/t/ssl_big.test@1.1, 2007-07-12 21:11:49-04:00, dkatz@damien-katzs-computer.local +62 -0
    BitKeeper file /Users/dkatz/50/mysql-test/t/ssl_big.test

  mysql-test/t/ssl_big.test@1.0, 2007-07-12 21:11:49-04:00, dkatz@damien-katzs-computer.local +0 -0

  client/mysqltest.c@1.155.9.105, 2007-07-12 22:06:31-04:00, dkatz@damien-katzs-computer.local +69 -16
    Added new command to mysqltest to send a quit command to the server, but to not close the actual socket on our end.
    
    Also changed code to reuse connection slots, so that the tests can open and close sockets in a loop.

  extra/yassl/include/openssl/ssl.h@1.14.1.10, 2007-07-12 22:06:31-04:00, dkatz@damien-katzs-computer.local +2 -0
    Added C accessors to the quietShutdown option.

  extra/yassl/include/yassl_int.hpp@1.11.1.8, 2007-07-12 22:06:31-04:00, dkatz@damien-katzs-computer.local +3 -0
    Added quietShutdown_ member and accessor methods to the SSL class.

  extra/yassl/src/ssl.cpp@1.16.1.15, 2007-07-12 22:06:31-04:00, dkatz@damien-katzs-computer.local +16 -2
    Added accessors to get/set the quietShutdown option and to not perform the shutdown handshake if quietShutdown is set.

  extra/yassl/src/yassl_int.cpp@1.19.1.6, 2007-07-12 22:06:31-04:00, dkatz@damien-katzs-computer.local +13 -1
    Added quietShutdown_ member and accessor methods to the SSL class.

  mysql-test/r/ssl-big.result@1.1, 2007-07-12 21:53:08-04:00, dkatz@damien-katzs-computer.local +3 -0
    BitKeeper file /Users/dkatz/50/mysql-test/r/ssl-big.result

  mysql-test/r/ssl-big.result@1.0, 2007-07-12 21:53:08-04:00, dkatz@damien-katzs-computer.local +0 -0

  mysql-test/t/ssl-big.test@1.1, 2007-07-12 22:06:31-04:00, dkatz@damien-katzs-computer.local +56 -0
    Added a test that causes an unpatched server to hang during SSL socket shutdown.

  mysql-test/t/ssl-big.test@1.0, 2007-07-12 22:06:31-04:00, dkatz@damien-katzs-computer.local +0 -0

  vio/viossl.c@1.34.2.9, 2007-07-12 22:06:31-04:00, dkatz@damien-katzs-computer.local +10 -0
    Added line to set the quiet_shutdown option before shutting down the socket.

ChangeSet@1.2529.18.2, 2007-07-12 17:39:07-07:00, brian@zim.(none) +2 -0
  Fixed locking issues around flushes. 

  storage/archive/ha_archive.cc@1.142, 2007-07-12 17:39:03-07:00, brian@zim.(none) +34 -25
    Added mutex around flush calls to make read's consistent (and not conflicting) 

  storage/archive/ha_archive.h@1.66, 2007-07-12 17:39:04-07:00, brian@zim.(none) +3 -0
    Fixed issues for fast count(*) call

ChangeSet@1.2529.21.2, 2007-07-13 03:29:25+05:00, svoj@mysql.com +4 -0
  BUG#29464 - load data infile into table with big5 chinese fulltext index
              hangs 100% cpu
  
  Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
  character set.

  mysql-test/r/fulltext.result@1.97, 2007-07-13 03:29:22+05:00, svoj@mysql.com +0 -4
    Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
    character set.

  mysql-test/r/fulltext3.result@1.2, 2007-07-13 03:29:22+05:00, svoj@mysql.com +4 -0
    Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
    character set.

  mysql-test/t/fulltext.test@1.89, 2007-07-13 03:29:22+05:00, svoj@mysql.com +0 -9
    Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
    character set.

  mysql-test/t/fulltext3.test@1.2, 2007-07-13 03:29:22+05:00, svoj@mysql.com +10 -0
    Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
    character set.

ChangeSet@1.2529.21.1, 2007-07-13 03:25:27+05:00, svoj@mysql.com +3 -0
  BUG#29445 - match ... against () never returns
  
  Part 2:
  Searching fulltext index for a word with boolean mode truncation
  operator may cause infinite loop.
  
  The problem was that "smarter index merge" was used with "trunc-words",
  which must never happen.
  
  Affects 5.1 only.

  mysql-test/r/fulltext.result@1.96, 2007-07-13 03:25:24+05:00, svoj@mysql.com +4 -1
    Addition to a test case for BUG#29445.

  mysql-test/t/fulltext.test@1.88, 2007-07-13 03:25:24+05:00, svoj@mysql.com +2 -1
    Addition to a test case for BUG#29445.

  storage/myisam/ft_boolean_search.c@1.112, 2007-07-13 03:25:24+05:00, svoj@mysql.com +8 -2
    Fulltext "smarter index merge" optimization assumes that rows
    it gets are ordered by doc_id. That is not the case when we
    search for a word with truncation operator. It may return
    rows in random order. Thus we may not use "smarter index merge"
    optimization with "trunc-words".
    
    Also fixed compiler warning introduced by Part 1 patch.

ChangeSet@1.1810.3157.1, 2007-07-12 23:14:00+04:00, kostja@bodhi.(none) +1 -0
  Apply community contributed fix for Bug#13326 SQLPS statement logging is 
  incomplete in 5.0 (and review fixes).
  
  When in 5.0.13 I introduced class Prepared_statement and methods
  ::prepare and ::execute, general logging was left out of this class.
  This was good for stored procedures, since in stored procedures
  we do not log sub-statements, but introduced a regression in case of SQL
  syntax for prepared statements, as previously we would log the actual
  statements to the log, and after the change we would log only
  COM_QUERY text.
  
  Restore the old behavior, but still suppress logging if inside a stored 
  procedure.
  
  Based on a community contributed patch from Vladimir Shebordaev.
  
  No test case since we do not have a mechanism to test output
  of the general log.

  sql/sql_prepare.cc@1.142.31.1, 2007-07-12 23:13:58+04:00, kostja@bodhi.(none) +45 -14
    Apply community contributed fix for Bug#13326 SQLPS statement logging is 
    incomplete in 5.0 (and review fixes).

ChangeSet@1.1810.3142.12, 2007-07-12 23:09:55+04:00, evgen@moonbone.local +3 -0
  Bug#29739: Incorrect time comparison in BETWEEN.
  
  Time values were compared by the BETWEEN function as strings. This led to a
  wrong result in cases when some of arguments are less than 100 hours and other
  are greater.
  
  Now if all 3 arguments of the BETWEEN function are of the TIME type then
  they are compared as integers.

  mysql-test/r/type_time.result@1.13.1.4, 2007-07-12 23:07:49+04:00, evgen@moonbone.local +6 -0
    Added a tes tcase for the bug#29739: Incorrect time comparison in BETWEEN.

  mysql-test/t/type_time.test@1.10, 2007-07-12 23:07:34+04:00, evgen@moonbone.local +8 -0
    Added a tes tcase for the bug#29739: Incorrect time comparison in BETWEEN.

  sql/item_cmpfunc.cc@1.187.1.72, 2007-07-12 23:08:13+04:00, evgen@moonbone.local +16 -8
    Bug#29739: Incorrect time comparison in BETWEEN.
    Now if all 3 arguments of the BETWEEN function are of the TIME type then
    they are compared as integers.

ChangeSet@1.1810.3156.1, 2007-07-12 22:26:41+04:00, kostja@bodhi.(none) +18 -0
  A fix and a test case for Bug#26141 mixing table types in trigger 
  causes full table lock on innodb table.
  Also fixes Bug#28502 Triggers that update another innodb table 
  will block on X lock unnecessarily (duplciate).
  Code review fixes.
  
  Both bugs' synopses are misleading: InnoDB table is
  not X locked. The statements, however, cannot proceed concurrently, 
  but this happens due to lock conflicts for tables used in triggers,
  not for the InnoDB table. 
  
  If a user had an InnoDB table, and two triggers, AFTER UPDATE and 
  AFTER INSERT, competing for different resources (e.g. two distinct
  MyISAM tables), then these two triggers would not be able to execute
  concurrently. Moreover, INSERTS/UPDATES of the InnoDB table would
  not be able to run concurrently. 
  The problem had other side-effects (see respective bug reports).
  
  This behavior was a consequence of a shortcoming of the pre-locking
  algorithm, which would not distinguish between different DML operations
  (e.g. INSERT and DELETE) and pre-lock all the tables
  that are used by any trigger defined on the subject table.
  
  The idea of the fix is to extend the pre-locking algorithm to keep track,
  for each table, what DML operation it is used for and not
  load triggers that are known to never be fired.

  mysql-test/r/trigger-trans.result@1.3, 2007-07-12 22:26:38+04:00, kostja@bodhi.(none) +59 -0
    Update results (Bug#26141)

  mysql-test/r/trigger.result@1.29.11.16, 2007-07-12 22:26:38+04:00, kostja@bodhi.(none) +457 -0
    Update results (Bug#28502)

  mysql-test/t/trigger-trans.test@1.2, 2007-07-12 22:26:38+04:00, kostja@bodhi.(none) +81 -1
    Add a test case for Bug#26141 mixing table types in trigger causes 
    full table lock on innodb table. 

  mysql-test/t/trigger.test@1.34.11.17, 2007-07-12 22:26:38+04:00, kostja@bodhi.(none) +365 -0
    Add a test case for Bug#28502 Triggers that update another innodb 
    table will block echo on X lock unnecessarily. Add more test 
    coverage for triggers.

  sql/item.h@1.183.37.2, 2007-07-12 22:26:38+04:00, kostja@bodhi.(none) +0 -8
    enum trg_event_type is needed in table.h

  sql/sp.cc@1.82.1.52, 2007-07-12 22:26:38+04:00, kostja@bodhi.(none) +37 -16
    Take into account table_list->trg_event_map when determining
    what tables to pre-lock. 
    
    After this change, if we attempt to fire a 
    trigger for which we had not pre-locked any tables, error
    'Table was not locked with LOCK TABLES' will be printed.
    This, however, should never happen, provided the pre-locking
    algorithm has no programming bugs.
    
    Previously a trigger key in the sroutines hash was based on the name 
    of the table the trigger belongs to. This was possible because we would
    always add to the pre-locking list all the triggers defined for a table when
    handling this table.
    Now the key is based on the name of the trigger, owing
    to the fact that a trigger name must be unique in the database it
    belongs to.

  sql/sp_head.cc@1.200.7.26, 2007-07-12 22:26:38+04:00, kostja@bodhi.(none) +44 -9
    Generate sroutines hash key in init_spname(). This is a convenient
    place since there we have all the necessary information and can
    avoid an extra alloc.
    
    Maintain and merge trg_event_map when adding and merging elements
    of the pre-locking list.

  sql/sp_head.h@1.79.1.20, 2007-07-12 22:26:38+04:00, kostja@bodhi.(none) +6 -0
    Add ,m_sroutines_key member, used when inserting the sphead for a
    trigger into the cache of routines used by a statement.
    Previously the key was based on the table name the trigger belonged
    to, since for a given table we would add to the sroutines list
    all the triggers defined on it.

  sql/sql_lex.cc@1.142.1.84, 2007-07-12 22:26:38+04:00, kostja@bodhi.(none) +21 -0
    Introduce a new lex step: set_trg_event_type_for_tables().
    It is called when we have finished parsing but before opening
    and locking tables. Now this step is used to evaluate for each
    TABLE_LIST instance which INSERT/UPDATE/DELETE operation, if any,
    it is used in.
    In future this method could be extended to aggregate other information
    that is hard to aggregate during parsing.

  sql/sql_lex.h@1.175.1.75, 2007-07-12 22:26:38+04:00, kostja@bodhi.(none) +2 -0
    Add declaration for set_trg_event_type_for_tables().

  sql/sql_parse.cc@1.426.1.204, 2007-07-12 22:26:38+04:00, kostja@bodhi.(none) +3 -2
    Call set_trg_event_type_for_tables() after MYSQLparse(). Remove tabs.

  sql/sql_prepare.cc@1.142.1.64, 2007-07-12 22:26:38+04:00, kostja@bodhi.(none) +1 -0
    Call set_trg_event_type_for_tables() after  MYSQLparse().

  sql/sql_trigger.cc@1.35.1.34, 2007-07-12 22:26:38+04:00, kostja@bodhi.(none) +16 -12
    Call set_trg_event_type_for_tables() after MYSQLparse().

  sql/sql_trigger.h@1.19.1.9, 2007-07-12 22:26:39+04:00, kostja@bodhi.(none) +0 -8
    Remove an obsolete member.

  sql/sql_view.cc@1.78.1.37, 2007-07-12 22:26:39+04:00, kostja@bodhi.(none) +13 -0
    Call set_trg_event_type_for_tables() after MYSQLparse().

  sql/sql_yacc.yy@1.371.119.1, 2007-07-12 22:26:39+04:00, kostja@bodhi.(none) +2 -2
    Move assignment of sp_head::m_type before calling sp_head::init_spname(), 
    one is now used inside another.

  sql/table.cc@1.160.1.94, 2007-07-12 22:26:39+04:00, kostja@bodhi.(none) +129 -0
    Implement TABLE_LIST::set_trg_event_map() - a method that calculates
    wh triggers may be fired on this table when executing a statement.

  sql/table.h@1.102.1.44, 2007-07-12 22:26:39+04:00, kostja@bodhi.(none) +19 -0
    Add missing declarations.
    Move declaration of trg_event_type from item.h (it will be needed for 
    trg_event_map bitmap when we start using Bitmap template instead
    of uint8).

ChangeSet@1.2529.20.1, 2007-07-12 20:21:17+02:00, istruewing@chilla.local +3 -0
  Bug#28158 - table->read_set is set incorrectly,
          causing wrong error message in Falcon
  
  An error message about a duplicate key could show a wrong key
  value when not all columns of the key were used to select the
  rows for update.
  
  Some storage engines return a record with only the selected
  columns filled.
  
  This is fixed by re-reading the record with a read_set which
  includes all columns of the duplicate key after a duplicate key
  error happens and before the error message is printed.

  mysql-test/r/ndb_update.result@1.20.1.1, 2007-07-12 20:21:13+02:00, istruewing@chilla.local +46 -0
    Bug#28158 - table->read_set is set incorrectly,
                causing wrong error message in Falcon
    Added test result.

  mysql-test/t/ndb_update.test@1.13.1.1, 2007-07-12 20:21:13+02:00, istruewing@chilla.local +49 -1
    Bug#28158 - table->read_set is set incorrectly,
                causing wrong error message in Falcon
    Added test from falcon_bug_28158.

  sql/sql_update.cc@1.249.1.1, 2007-07-12 20:21:13+02:00, istruewing@chilla.local +91 -3
    Bug#28158 - table->read_set is set incorrectly,
                causing wrong error message in Falcon
    Added a function for re-reading a record with a read_set
    that contains all fields used by a duplicate key.
    Called the function before every call to handler::print_error(),
    which could print a duplicate key value.

ChangeSet@1.2529.9.4, 2007-07-12 17:27:53+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #29612  	Cluster ndbd can't write to file, linux kernel 2.4
  - remove usage for now

  mysql-test/ndb/ndb_config_2_node.ini@1.25, 2007-07-12 17:27:50+02:00, tomas@whalegate.ndb.mysql.com +2 -1
    Bug #29612  	Cluster ndbd can't write to file, linux kernel 2.4
    - remove usage for now

ChangeSet@1.1810.3142.11, 2007-07-12 15:12:56+03:00, gkodinov@magare.gmz +4 -0
  Bug 29325: test suite is not applicable on windows

  mysql-test/r/create.result@1.107.1.25, 2007-07-12 15:12:55+03:00, gkodinov@magare.gmz +0 -22
    Bug 29325: test suite is not applicable on windows

  mysql-test/r/create_not_windows.result@1.1.2.1, 2007-07-12 15:12:55+03:00, gkodinov@magare.gmz +22 -0
    Bug 29325: test suite is not applicable on windows

  mysql-test/t/create.test@1.71.1.20, 2007-07-12 15:12:55+03:00, gkodinov@magare.gmz +0 -37
    Bug 29325: test suite is not applicable on windows

  mysql-test/t/create_not_windows.test@1.1.1.1, 2007-07-12 15:12:55+03:00, gkodinov@magare.gmz +39 -0
    Bug 29325: test suite is not applicable on windows

ChangeSet@1.1810.3154.1, 2007-07-12 13:29:51+02:00, thek@adventure.(none) +5 -0
  Bug#28249 Query Cache returns wrong result with concurrent insert / certain lock
  
  A race condition in the integration between MyISAM and the query cache code 
  caused the query cache to fail to invalidate itself on concurrently inserted
  data.
  
  This patch fix this problem by using the existing handler interface which, upon
  each statement cache attempt, compare the size of the table as viewed from the 
  cache writing thread and with any snap shot of the global table state. If the
  two sizes are different the global table size is unknown and the current
  statement can't be cached.

  mysql-test/r/query_cache.result@1.65.8.1, 2007-07-12 13:29:50+02:00, thek@adventure.(none) +39 -0
    Added test case

  mysql-test/t/query_cache.test@1.49.5.1, 2007-07-12 13:29:50+02:00, thek@adventure.(none) +73 -0
    Added test case

  sql/handler.h@1.138.18.1, 2007-07-12 13:29:50+02:00, thek@adventure.(none) +39 -6
    - Documented register_query_cache_table method in the handler interface.

  sql/ha_myisam.cc@1.147.21.1, 2007-07-12 13:29:50+02:00, thek@adventure.(none) +74 -0
    - Implemented handler interface for ha_myisam class to dermine if the table
     belonging to the currently processed statement can be cached or not.

  sql/ha_myisam.h@1.68.4.1, 2007-07-12 13:29:50+02:00, thek@adventure.(none) +7 -0
    - Implemented handler interface for ha_myisam class to dermine if the table
     belonging to the currently processed statement can be cached or not.

ChangeSet@1.2526.1.2, 2007-07-12 12:49:39+04:00, anozdrin@ibm. +6 -0
  Fix for 5.1 for BUG#10491: Server returns data as charset binary
  SHOW CREATE TABLE or SELECT FROM I_S.
  
  This is the last patch for this bug, which depends on the big
  CS patch and was pending.
  
  The problem was that SHOW CREATE statements returned original
  queries in the binary character set. That could cause the query
  to be unreadable.
  
  The fix is to use original character_set_client when sending
  the original query to the client. In order to preserve the query
  in mysqldump, 'binary' character set results should be set when
  issuing SHOW CREATE statement. If either source or destination
  character set is 'binary' , no conversion is performed.
  The idea is that since the source character set is no longer
  'binary', we fix the destination character set to still produce
  valid dumps.

  client/mysqldump.c@1.282.1.3, 2007-07-12 12:49:37+04:00, anozdrin@ibm. +43 -0
    Switch character_set_results of mysqldump-connection before
    calling SHOW CREATE statements for the objects.

  mysql-test/r/show_check.result@1.113.2.1, 2007-07-12 12:49:37+04:00, anozdrin@ibm. +39 -0
    Result file.

  mysql-test/t/show_check.test@1.80.1.1, 2007-07-12 12:49:37+04:00, anozdrin@ibm. +64 -0
    Add test case for the part of BUG#10491.

  sql/events.cc@1.82, 2007-07-12 12:49:37+04:00, anozdrin@ibm. +2 -1
    Send original query in the original character set.

  sql/sp_head.cc@1.280, 2007-07-12 12:49:37+04:00, anozdrin@ibm. +2 -1
    Send original query in the original character set.

  sql/sql_show.cc@1.416.2.1, 2007-07-12 12:49:37+04:00, anozdrin@ibm. +10 -2
    Send original query in the original character set.

ChangeSet@1.2538, 2007-07-12 15:19:29+08:00, Justin.He@dev3-240.dev.cn.tlan +15 -0
  Bug#19259 rpl_ndb_dd_partitions failed on Solaris
  
  Actually, this testcase will fail generally on all testing platforms.
  The bugs come from the inconsistent bitmap between rpl master and slave.
  
  In log_event.cc, the n_bits of m_cols and m_cols_ai are intialized with octal-ceiling 
  m_width, in fact, their n_bits should be equal to m_width.
  Wrong n_bits will cause bitmap_bits_set() get incorrect value in unpack_row()
  in rpl_record.cc, 
  then an assertion in unpack_row() will fail and crash sql thread.
    DBUG_ASSERT(null_ptr == row_data + master_null_byte_count);
  
  Meanwhile, because of binlog_prepare_pending_rows_event() changed with correct
  m_cols, some results of specific testcases should be updated:
  binlog_multi_engine.test
  ndb_binlog_multi.test
  rpl_ndb_dd_partitions.test
  rpl_ndb_log.test
  rpl_truncate_7ndb.test
  rpl_truncate_7ndb_2.test
  
  In addition, to ensure rows replication correct between master and slave after the patch, 
  two 'select * from t1' are added in extra/rpl_tests/rpl_log.test, and some testcases include 
  rpl_log.test, therefore, the results of these testcases should be updated likewise:
  rpl_stm_log.test
  rpl_row_log.test
  rpl_ndb_log.test
  rpl_row_log_innodb.test
  
  Totally, results of nine testcases are updated.

  include/my_bitmap.h@1.24.1.1, 2007-07-12 15:19:24+08:00, Justin.He@dev3-240.dev.cn.tlan +1 -0
    add declaration for create_last_word_mask(), since we need to use it in log_event.cc

  mysql-test/extra/rpl_tests/rpl_log.test@1.48, 2007-07-12 15:19:24+08:00, Justin.He@dev3-240.dev.cn.tlan +6 -0
    add 'select * from t1' both on master and slave to ensure the replication consistent after patched

  mysql-test/r/binlog_multi_engine.result@1.8.1.1, 2007-07-12 15:19:24+08:00, Justin.He@dev3-240.dev.cn.tlan +0 -2
    update result
    
    the following is commented by Andrei, 
    The differences can be explained.
    Look at
    lines of THD::binlog_prepare_pending_rows_event
    
      if (!pending)
           ...
          !bitmap_cmp(pending->get_cols(), cols))
    
    The row event disappears because after correcting master side Write_rows_log_event's m_col bitmap initialization, 
    this event has the same m_cols as the preceding one and thereafter they got glued into one bigger size event. 
    This is the correct behaviour now. 
    

  mysql-test/r/ndb_binlog_multi.result@1.9.1.1, 2007-07-12 15:19:24+08:00, Justin.He@dev3-240.dev.cn.tlan +0 -4
    update result
    same reason with binlog_multi_engine for Write_rows_log_event

  mysql-test/r/rpl_row_log.result@1.19.1.1, 2007-07-12 15:19:24+08:00, Justin.He@dev3-240.dev.cn.tlan +142 -0
    because add new select in extra/rpl_testsrpl_log.test, 
    corresponding new results are accompanying.

  mysql-test/r/rpl_row_log_innodb.result@1.19.1.1, 2007-07-12 15:19:25+08:00, Justin.He@dev3-240.dev.cn.tlan +142 -0
    because add new select in extra/rpl_testsrpl_log.test, 
    corresponding new results are accompanying.

  mysql-test/r/rpl_stm_log.result@1.81.1.1, 2007-07-12 15:19:25+08:00, Justin.He@dev3-240.dev.cn.tlan +142 -0
    because add new select in extra/rpl_testsrpl_log.test, 
    corresponding new results are accompanying.

  mysql-test/r/rpl_truncate_7ndb_2.result@1.2.1.1, 2007-07-12 15:19:25+08:00, Justin.He@dev3-240.dev.cn.tlan +34 -34
    update result
    same reason with binlog_multi_engine for Write_rows_log_event
    
    And for the change
    -master-bin.000001  4   Format_desc  1   102 Server ver: SERVER_VERSION, Binlog ver: 4
    +master-bin.000001  4   Format_desc  1   106 Server ver: SERVER_VERSION, Binlog ver
    
    It's  okay as FormatDescription event matured for 4 bytes since the last time the results had been recorded.

  mysql-test/r/rpl_ndb_dd_partitions.result@1.1.1.1, 2007-07-12 15:19:24+08:00, Justin.He@dev3-240.dev.cn.tlan +22 -22
    update result,
    reasons:
    1. tablespace description format changed
    2. hex(b1) from 1 to 0 because there is a update sentence in include/rpl_multi_engine3.inc
    UPDATE t1 SET b1 = 0, t="2006-02-22" WHERE id = 412;

  mysql-test/r/rpl_ndb_log.result@1.27.1.1, 2007-07-12 15:19:24+08:00, Justin.He@dev3-240.dev.cn.tlan +144 -5
    update result
    Write_rows event disapper for same reason with binlog_multi_engine ;
    In addition, because add new select in extra/rpl_testsrpl_log.test, 
    corresponding new results are accompanying.

  mysql-test/r/rpl_truncate_7ndb.result@1.10.2.1, 2007-07-12 15:19:25+08:00, Justin.He@dev3-240.dev.cn.tlan +22 -26
    update result
    same reason with binlog_multi_engine for Write_rows_log_event

  mysql-test/t/disabled.def@1.266.1.3, 2007-07-12 15:19:25+08:00, Justin.He@dev3-240.dev.cn.tlan +0 -1
    resume this test case

  mysql-test/t/rpl_ndb_dd_partitions-master.opt@1.1, 2007-07-12 15:19:25+08:00, Justin.He@dev3-240.dev.cn.tlan +1 -0
    add --new=true passed to mysqld 

  mysql-test/t/rpl_ndb_dd_partitions-master.opt@1.0, 2007-07-12 15:19:25+08:00, Justin.He@dev3-240.dev.cn.tlan +0 -0

  mysql-test/t/rpl_ndb_dd_partitions-slave.opt@1.1, 2007-07-12 15:19:25+08:00, Justin.He@dev3-240.dev.cn.tlan +1 -0
    add --new=true passed to mysqld

  mysql-test/t/rpl_ndb_dd_partitions-slave.opt@1.0, 2007-07-12 15:19:25+08:00, Justin.He@dev3-240.dev.cn.tlan +0 -0

  sql/log_event.cc@1.290.1.1, 2007-07-12 15:19:25+08:00, Justin.He@dev3-240.dev.cn.tlan +12 -4
    initialize m_cols' n_bits with m_width instead of octal-round(m_width);
    initialize m_cols_ai' n_bits with m_width instead of octal-round(m_width);
    after memcpy(), call create_last_word_mask() to clear extra bits in bitmap to ensure safety

ChangeSet@1.1810.3153.1, 2007-07-11 18:45:35-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #29604.
  A bug in the restore_prev_nj_state function allowed interleaving 
  inner tables of outer join operations with outer tables. With the
  current implementation of the nested loops algorithm it could lead
  to wrong result sets for queries with nested outer joins.
  Another bug in this procedure effectively blocked evaluation of some
  valid execution plans for queries with nested outer joins. 

  mysql-test/r/join_nested.result@1.23.1.3, 2007-07-11 18:45:21-07:00, igor@olga.mysql.com +111 -0
    Added a test case for bug #29604.

  mysql-test/t/join_nested.test@1.22, 2007-07-11 18:45:21-07:00, igor@olga.mysql.com +114 -0
    Added a test case for bug #29604.

  sql/sql_select.cc@1.312.163.1, 2007-07-11 18:45:22-07:00, igor@olga.mysql.com +8 -2
    Fixed bug #29604.
    A bug in the restore_prev_nj_state function allowed interleaving 
    inner tables of outer join operations with outer tables. With the
    current implementation of the nested loops algorithm it could lead
    to wrong result sets for queries with nested outer joins.
    Another bug in this procedure effectively blocked evaluation of some
    valid execution plans for queries with nested outer joins. 

ChangeSet@1.1810.3127.4, 2007-07-12 01:10:29+04:00, kostja@bodhi.(none) +3 -0
  A fix and a test case for Bug#25859 ALTER DATABASE works w/o parameters.
  Fix the parser to make the database options not optional.

  mysql-test/r/information_schema.result@1.87.1.36, 2007-07-12 01:10:26+04:00, kostja@bodhi.(none) +6 -1
    Update results (Bug#25859)

  mysql-test/t/information_schema.test@1.65.1.27, 2007-07-12 01:10:26+04:00, kostja@bodhi.(none) +9 -2
    Add a test case for Bug#25859 "ALTER DATABASE works w/o parameters"

  sql/sql_yacc.yy@1.371.118.2, 2007-07-12 01:10:26+04:00, kostja@bodhi.(none) +1 -1
    Fix Bug#25859 ALTER DATABASE works w/o parameters - require
    parameters in the parser.

ChangeSet@1.1810.3150.2, 2007-07-12 00:55:40+05:00, gshchepa@gleb.loc +1 -0
  field_conv.cc:
    Additional fix for bug #29360.

  sql/field_conv.cc@1.52.1.17, 2007-07-12 00:54:51+05:00, gshchepa@gleb.loc +1 -0
    Additional fix for bug #29360.

ChangeSet@1.1810.3151.1, 2007-07-11 23:18:02+04:00, evgen@moonbone.local +3 -0
  Bug#29555: Comparing time values as strings may lead to a wrong result.
  
  Time values were compared as strings. This led to a wrong comparison
  result when comparing values one of which is under 100 hours and another is
  over 100 hours.
  
  Now when the Arg_comparator::set_cmp_func function sees that both items to
  compare are of the TIME type it sets the comparator to the
  Arg_comparator::compare_e_int or the Arg_comparator::compare_int_unsigned
  functions.

  mysql-test/r/type_time.result@1.13.1.3, 2007-07-11 23:17:48+04:00, evgen@moonbone.local +18 -0
    Added a test case for the bug#29555: Comparing time values as strings may
    lead to a wrong result.

  mysql-test/t/type_time.test@1.9, 2007-07-11 23:17:50+04:00, evgen@moonbone.local +10 -0
    Added a test case for the bug#29555: Comparing time values as strings may
    lead to a wrong result.

  sql/item_cmpfunc.cc@1.187.1.71, 2007-07-11 23:17:33+04:00, evgen@moonbone.local +12 -0
    Bug#29555: Comparing time values as strings may lead to a wrong result.
    Now when the Arg_comparator::set_cmp_func function sees that both items to
    compare are of the TIME type it sets the comparator to the
    Arg_comparator::compare_e_int or the Arg_comparator::compare_int_unsigned
    functions.

ChangeSet@1.1810.3150.1, 2007-07-12 00:03:08+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #29360.
  The special `zero' enum value was coerced to the normal
  empty string enum value during a field-to-field copy.
  This bug affected CREATE ... SELECT statements and
  SELECT aggregate GROUP BY enum field statements.
  
  Also this bug made unnecessary warnings during
  the execution of CREATE ... SELECT statements:
  Warning       1265    Data truncated for column...

  mysql-test/r/type_enum.result@1.27.1.5, 2007-07-12 00:02:46+05:00, gshchepa@gleb.loc +20 -0
    Updated test case for bug #29360.

  mysql-test/r/type_ranges.result@1.38.1.7, 2007-07-12 00:02:53+05:00, gshchepa@gleb.loc +0 -4
    Updated test case for bug #29360.

  mysql-test/t/type_enum.test@1.16.2.4, 2007-07-12 00:02:43+05:00, gshchepa@gleb.loc +18 -0
    Updated test case for bug #29360.

  sql/field_conv.cc@1.52.1.16, 2007-07-12 00:02:39+05:00, gshchepa@gleb.loc +11 -5
    Fixed bug #29360.
    The field_conv function has been modified to properly convert
    the special `zero' enum value between enum fields.

ChangeSet@1.1810.3142.6, 2007-07-11 18:02:47+03:00, gkodinov@magare.gmz +2 -0
  Addendum to bug 29325:
  test if TRUNCATE TABLE works with keep_files_on_create

  mysql-test/r/create.result@1.107.1.24, 2007-07-11 18:02:46+03:00, gkodinov@magare.gmz +6 -1
    Addendum to bug 29325:
    test if TRUNCATE TABLE works with keep_files_on_create

  mysql-test/t/create.test@1.71.1.19, 2007-07-11 18:02:46+03:00, gkodinov@magare.gmz +7 -1
    Addendum to bug 29325:
    test if TRUNCATE TABLE works with keep_files_on_create

ChangeSet@1.1810.3149.1, 2007-07-11 18:38:45+04:00, kaa@polly.local +1 -0
  Fix for bug #24192 "MySQL replication does not exit server when running out of memory"
  
  In case of out-of-memory error received from the master, print the corresponding message to the error log and stop slave I/O thread to avoid reconnecting with a wrong binary log position.

  sql/slave.cc@1.241.21.1, 2007-07-11 18:38:42+04:00, kaa@polly.local +17 -13
    In case of out-of-memory error received from the master, print the corresponding message to the error log and stop slave I/O thread to avoid reconnecting with a wrong binary log position.

ChangeSet@1.2529.13.5, 2007-07-11 15:26:19+02:00, serg@janus.mylan +3 -0
  fix for smarter index mergein fulltext
  to work for queries like "+a (b)"

  mysql-test/r/fulltext.result@1.95, 2007-07-11 15:26:09+02:00, serg@janus.mylan +3 -0
    second test for BUG#29445

  mysql-test/t/fulltext.test@1.87, 2007-07-11 15:26:09+02:00, serg@janus.mylan +1 -0
    second test for BUG#29445

  storage/myisam/ft_boolean_search.c@1.111, 2007-07-11 15:26:09+02:00, serg@janus.mylan +19 -6
    fix for smarter index merge, to work for queries like "+a (b)"

ChangeSet@1.2482.8.58, 2007-07-11 14:36:44+02:00, tomas@whalegate.ndb.mysql.com +12 -0
  fix ndb_version.h so that it is usable and make some functions public to handle ndb version

  storage/ndb/include/ndb_version.h.in@1.15, 2007-07-11 14:36:40+02:00, tomas@whalegate.ndb.mysql.com +36 -21
    fix ndb_version.h so that it is usable and make some functions public to handle ndb version

  storage/ndb/include/util/version.h@1.7, 2007-07-11 14:36:40+02:00, tomas@whalegate.ndb.mysql.com +8 -15
    fix ndb_version.h so that it is usable and make some functions public to handle ndb version

  storage/ndb/src/common/util/version.c@1.30, 2007-07-11 14:36:40+02:00, tomas@whalegate.ndb.mysql.com +15 -8
    fix ndb_version.h so that it is usable and make some functions public to handle ndb version

  storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp@1.16, 2007-07-11 14:36:40+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    fix ndb_version.h so that it is usable and make some functions public to handle ndb version

  storage/ndb/src/kernel/blocks/diskpage.cpp@1.3, 2007-07-11 14:36:40+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    fix ndb_version.h so that it is usable and make some functions public to handle ndb version

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.56, 2007-07-11 14:36:40+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    fix ndb_version.h so that it is usable and make some functions public to handle ndb version

  storage/ndb/src/kernel/blocks/restore.cpp@1.16, 2007-07-11 14:36:40+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    fix ndb_version.h so that it is usable and make some functions public to handle ndb version

  storage/ndb/src/kernel/vm/SimulatedBlock.hpp@1.33, 2007-07-11 14:36:40+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    fix ndb_version.h so that it is usable and make some functions public to handle ndb version

  storage/ndb/src/mgmsrv/Services.cpp@1.95, 2007-07-11 14:36:40+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    fix ndb_version.h so that it is usable and make some functions public to handle ndb version

  storage/ndb/src/ndbapi/ClusterMgr.cpp@1.38, 2007-07-11 14:36:40+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    fix ndb_version.h so that it is usable and make some functions public to handle ndb version

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.172, 2007-07-11 14:36:40+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    fix ndb_version.h so that it is usable and make some functions public to handle ndb version

  storage/ndb/tools/restore/restore_main.cpp@1.56.1.1, 2007-07-11 14:36:41+02:00, tomas@whalegate.ndb.mysql.com +3 -3
    fix ndb_version.h so that it is usable and make some functions public to handle ndb version

ChangeSet@1.2529.19.1, 2007-07-11 15:16:54+04:00, sergefp@mysql.com +1 -0
  BUG#29610: crash in func_group on 64bit platform:
  - make merge_buffers():sort_length have type size_t as this type is 
    expected by, e.g. ptr_compare_1, which will receive pointer to 
    sort_length as comparison parameter.

  sql/filesort.cc@1.133, 2007-07-11 15:16:47+04:00, sergefp@mysql.com +2 -1
    BUG#29610: crash in func_group on 64bit platform:
    - make sort_length have type size_t as this type is expected by, e.g.
      ptr_compare_1, which will receive pointer to sort_length as comparison
      parameter.

ChangeSet@1.2529.3.11, 2007-07-11 13:09:39+03:00, gkodinov@magare.gmz +1 -0
  porting 29070 to 5.1-opt 

  storage/myisam/sp_key.c@1.15, 2007-07-11 13:09:37+03:00, gkodinov@magare.gmz +3 -3
    porting 29070 to 5.1-opt 

ChangeSet@1.1810.3142.5, 2007-07-11 12:37:47+03:00, gkodinov@magare.gmz +1 -0
  fixed uninitialized variable introduced by the fix for bug 29325

  myisam/mi_create.c@1.45.20.1, 2007-07-11 12:37:46+03:00, gkodinov@magare.gmz +2 -4
    fixed uninitialized variable introduced by the fix for bug 29325

ChangeSet@1.1810.3148.1, 2007-07-11 10:49:54+03:00, gkodinov@magare.gmz +9 -0
  Bug #29325: 
  By default MyISAM overwrites .MYD and .MYI files no 
  DATA DIRECTORY option is used. This can lead to two tables
  using the same .MYD and .MYI files (that can't be dropped).
  
  To prevent CREATE TABLE from overwriting a file a new option
  is introduced : keep_files_on_create
  When this is on the CREATE TABLE throws an error if either
  the .MYD or .MYI exists for a MyISAM table.
  The option is off by default (resulting in compatible behavior).

  include/my_base.h@1.70.6.1, 2007-07-11 10:49:53+03:00, gkodinov@magare.gmz +1 -0
    Bug #29325: introduce keep_files_on_create

  mysql-test/r/create.result@1.107.1.23, 2007-07-11 10:49:53+03:00, gkodinov@magare.gmz +17 -0
    Bug #29325: test case

  mysql-test/t/create.test@1.71.1.18, 2007-07-11 10:49:53+03:00, gkodinov@magare.gmz +31 -0
    Bug #29325: test case

  sql/set_var.cc@1.125.27.5, 2007-07-11 10:49:53+03:00, gkodinov@magare.gmz +6 -0
    Bug #29325: introduce keep_files_on_create

  sql/sql_class.h@1.230.1.110, 2007-07-11 10:49:53+03:00, gkodinov@magare.gmz +1 -0
    Bug #29325: introduce keep_files_on_create

  sql/sql_table.cc@1.239.1.112, 2007-07-11 10:49:53+03:00, gkodinov@magare.gmz +2 -0
    Bug #29325: introduce keep_files_on_create

  sql/unireg.cc@1.53.11.2, 2007-07-11 10:49:53+03:00, gkodinov@magare.gmz +2 -0
    Bug #29325: introduce keep_files_on_create

  sql/ha_myisam.cc@1.147.20.1, 2007-07-11 10:49:53+03:00, gkodinov@magare.gmz +2 -0
    Bug #29325: introduce keep_files_on_create

  myisam/mi_create.c@1.45.19.1, 2007-07-11 10:49:53+03:00, gkodinov@magare.gmz +4 -2
    Bug #29325: introduce keep_files_on_create

ChangeSet@1.2529.17.1, 2007-07-11 04:33:19+02:00, tnurnberg@mysql.com +1 -0
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  Streamlining test for RBR

  mysql-test/suite/binlog/r/binlog_row_binlog.result@1.20, 2007-07-11 04:33:17+02:00, tnurnberg@mysql.com +0 -109
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    Streamlining test for RBR

ChangeSet@1.2514.16.2, 2007-07-10 18:31:50+02:00, tnurnberg@mysql.com +1 -0
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  streamlining the test

  mysql-test/suite/binlog/r/binlog_stm_binlog.result@1.37, 2007-07-10 18:31:06+02:00, tnurnberg@mysql.com +413 -413
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    streamlining the test

ChangeSet@1.1810.3126.10, 2007-07-10 08:16:51-06:00, tsmith@sita.local +19 -0
  NULL MERGE UP to 5.1.
  
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Fixes:
  Bug#9709:  InnoDB inconsistensy causes "Operating System Error 32/33"
  Bug#22819: SHOW INNODB STATUS crashes the server with an assertion failure under high load
  Bug#25645: Assertion failure in file srv0srv.c
  Bug#27294: insert into ... select ... causes crash with innodb_locks_unsafe_for_binlog=1
  Bug#28138: indexing column prefixes produces corruption in InnoDB

  innobase/btr/btr0btr.c@1.38.7.1, 2007-07-10 08:16:47-06:00, tsmith@sita.local +5 -2
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1547:
    branches/5.0: Merge r1546 from trunk:
    
    When buffering an insert to a prefix index of a variable-length column,
    do not incorrectly mark the column as fixed-length.  (Bug #28138)
    
    ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
    dtype_new_store_for_order_and_null_size().  Add debug assertions.
    
    btr_index_rec_validate(): Correct a comment about prefix indexes.
    
    rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
    debug assertions and comments.
    
    dict_col_type_assert_equal(): New debug function.

  innobase/buf/buf0buf.c@1.45.16.1, 2007-07-10 08:16:47-06:00, tsmith@sita.local +100 -8
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1502:
    branches/5.0: Add debug code for Bug 26081. This change has some debug
    assertions that have been promoted to normal assertions. These will need
    to be undone once we've nailed this bug.

  innobase/buf/buf0lru.c@1.24.5.1, 2007-07-10 08:16:48-06:00, tsmith@sita.local +0 -2
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1502:
    branches/5.0: Add debug code for Bug 26081. This change has some debug
    assertions that have been promoted to normal assertions. These will need
    to be undone once we've nailed this bug.

  sql/ha_innodb.cc@1.202.45.1, 2007-07-10 08:16:49-06:00, tsmith@sita.local +29 -10
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1436:
    branches/5.0: Fix Bug#27294 by using trx returned by check_trx_exists()
    instead of prebuilt->trx. This has been fixed in 5.1 in r782.
    
    Approved by:	Heikki
    
    
    Revision r1443:
    branches/5.0: merge r1442 from trunk:
    
    Potential fix for Bug#25645:
    
    "Move innobase_release_stat_resources(trx) outside the 'if' in
    ha_innobase::external_lock(). That would add more safety that whatever
    MySQL does at a query end, there would be no risk of a hang on the btr
    search latch."
    
    Also call innobase_release_temporary_latches() in the beginning of
    ha_innobase::close().
    
    Approved by:	Heikki
    
    
    Revision r1454:
    branches/5.0: merge r1453 from trunk:
    
    Bugfix: only call innobase_release_temporary_latches() in case of current_thd
    is not NULL, otherwise we get NULL pointer dereferencing.
    
    
    
    Revision r1504:
    branches/5.0: Apply patch for Bug 27650 from MySQL.
    
    
    Revision r1539:
    Backport of r1538 from 5.1
    Do not return error in ha_innobase::info if srv_force_recovery >= 4. This is to allow for
    normal processing of the query by MySQL instead of generating an error.
    
    Reviewed by: Heikki

  innobase/ibuf/ibuf0ibuf.c@1.36.7.1, 2007-07-10 08:16:48-06:00, tsmith@sita.local +26 -4
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1547:
    branches/5.0: Merge r1546 from trunk:
    
    When buffering an insert to a prefix index of a variable-length column,
    do not incorrectly mark the column as fixed-length.  (Bug #28138)
    
    ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
    dtype_new_store_for_order_and_null_size().  Add debug assertions.
    
    btr_index_rec_validate(): Correct a comment about prefix indexes.
    
    rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
    debug assertions and comments.
    
    dict_col_type_assert_equal(): New debug function.

  innobase/include/buf0buf.ic@1.17.9.1, 2007-07-10 08:16:48-06:00, tsmith@sita.local +16 -5
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1502:
    branches/5.0: Add debug code for Bug 26081. This change has some debug
    assertions that have been promoted to normal assertions. These will need
    to be undone once we've nailed this bug.

  innobase/include/buf0lru.h@1.7.3.1, 2007-07-10 08:16:48-06:00, tsmith@sita.local +0 -2
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1502:
    branches/5.0: Add debug code for Bug 26081. This change has some debug
    assertions that have been promoted to normal assertions. These will need
    to be undone once we've nailed this bug.

  innobase/include/dict0dict.h@1.31.9.1, 2007-07-10 08:16:48-06:00, tsmith@sita.local +11 -0
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1547:
    branches/5.0: Merge r1546 from trunk:
    
    When buffering an insert to a prefix index of a variable-length column,
    do not incorrectly mark the column as fixed-length.  (Bug #28138)
    
    ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
    dtype_new_store_for_order_and_null_size().  Add debug assertions.
    
    btr_index_rec_validate(): Correct a comment about prefix indexes.
    
    rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
    debug assertions and comments.
    
    dict_col_type_assert_equal(): New debug function.

  innobase/include/dict0dict.ic@1.11.3.1, 2007-07-10 08:16:48-06:00, tsmith@sita.local +24 -0
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1547:
    branches/5.0: Merge r1546 from trunk:
    
    When buffering an insert to a prefix index of a variable-length column,
    do not incorrectly mark the column as fixed-length.  (Bug #28138)
    
    ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
    dtype_new_store_for_order_and_null_size().  Add debug assertions.
    
    btr_index_rec_validate(): Correct a comment about prefix indexes.
    
    rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
    debug assertions and comments.
    
    dict_col_type_assert_equal(): New debug function.

  innobase/include/dict0mem.h@1.24.3.1, 2007-07-10 08:16:48-06:00, tsmith@sita.local +7 -4
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1537:
    branches/5.0: merge r1536 and partially r1535
    
    Change the comment to a more appropriate one. Discussed with Heikki on IM.
    
    Document that DICT_MAX_INDEX_COL_LEN should not be changed.

  innobase/include/os0file.h@1.34.9.1, 2007-07-10 08:16:48-06:00, tsmith@sita.local +2 -1
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1417:
    branches/5.0: Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or
    ERROR_LOCK_VIOLATION is encountered during file operation.
    This is caused by backup software, so InnoDB should retry while the backup
    software is done with the file.
    
    Approved by:	Heikki

  innobase/include/trx0trx.h@1.45.7.1, 2007-07-10 08:16:48-06:00, tsmith@sita.local +1 -1
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1463:
    branches/5.0: merge r1462 from trunk:
    
    Fix typo in comment.

  innobase/lock/lock0lock.c@1.55.13.1, 2007-07-10 08:16:48-06:00, tsmith@sita.local +0 -6
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1458:
    branches/5.0: Fix Bug#22819, remove assertion.  (http://bugs.mysql.com/bug.php?id=22819)

  innobase/log/log0log.c@1.41.8.1, 2007-07-10 08:16:48-06:00, tsmith@sita.local +16 -17
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1520:
    Patch to allow monitor threads to stop before proceeding with normal shutdown. 
    Also have a separate time counter for tablespace monitor.
    
    reviewed by: Heikki
    
    
    Revision r1525:
    backport of r1524
    
    Log:
    Undo bad space formatting introduced in earlier commit r1521
    
    spotted by: Marko

  innobase/mtr/mtr0mtr.c@1.9.2.1, 2007-07-10 08:16:48-06:00, tsmith@sita.local +11 -2
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1502:
    branches/5.0: Add debug code for Bug 26081. This change has some debug
    assertions that have been promoted to normal assertions. These will need
    to be undone once we've nailed this bug.

  innobase/os/os0file.c@1.103.17.1, 2007-07-10 08:16:48-06:00, tsmith@sita.local +16 -1
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1417:
    branches/5.0: Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or
    ERROR_LOCK_VIOLATION is encountered during file operation.
    This is caused by backup software, so InnoDB should retry while the backup
    software is done with the file.
    
    Approved by:	Heikki

  innobase/rem/rem0rec.c@1.15.4.1, 2007-07-10 08:16:48-06:00, tsmith@sita.local +20 -4
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1547:
    branches/5.0: Merge r1546 from trunk:
    
    When buffering an insert to a prefix index of a variable-length column,
    do not incorrectly mark the column as fixed-length.  (Bug #28138)
    
    ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
    dtype_new_store_for_order_and_null_size().  Add debug assertions.
    
    btr_index_rec_validate(): Correct a comment about prefix indexes.
    
    rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
    debug assertions and comments.
    
    dict_col_type_assert_equal(): New debug function.

  innobase/row/row0sel.c@1.92.13.1, 2007-07-10 08:16:48-06:00, tsmith@sita.local +25 -0
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1456:
    branches/5.0: merge r1452 from trunk:
    
    Fix phantom reads (http://bugs.mysql.com/27197) following Heikki's
    patch in the bug followup.

  innobase/srv/srv0srv.c@1.87.11.1, 2007-07-10 08:16:49-06:00, tsmith@sita.local +6 -4
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Revision r1460:
    branches/5.0: Merge r1459 from trunk:
    
    Fix typo in the comment.
    
    
    Revision r1520:
    Patch to allow monitor threads to stop before proceeding with normal shutdown. 
    Also have a separate time counter for tablespace monitor.
    
    reviewed by: Heikki

ChangeSet@1.2529.16.1, 2007-07-10 05:37:43-06:00, tsmith@sita.local +74 -0
  Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
  
  After applying the snapshots, ensure that code conforms to the final version
  of WL 3914.
  
  It is signficant that, after these changes, InnoDB does not define MYSQL_SERVER,
  and can be built as an independent storage engine plugin.
  
  Fixes:
  Bug#9709:  InnoDB inconsistensy causes "Operating System Error 32/33"
  Bug#18828: If InnoDB runs out of undo slots, it returns misleading 'table is full'
  Bug#20090: InnoDB: Error: trying to declare trx to enter InnoDB
  Bug#20352: Make ibuf_contract_for_n_pages tunable
  Bug#21101: Wrong error on exceeding max row size for InnoDB table
  Bug#21293: Deadlock detection prefers to kill long running FOR UPDATE queries
  Bug#22819: SHOW INNODB STATUS crashes the server with an assertion failure under high load
  Bug#25078: Make the replication thread to ignore innodb_thread_concurrency
  Bug#25645: Assertion failure in file srv0srv.c
  Bug#28138: indexing column prefixes produces corruption in InnoDB

  BitKeeper/deleted/.del-Makefile.am~11d601934b49c19@1.6, 2007-07-09 15:10:22-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/fut/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~20a219ccf7825d65@1.6, 2007-07-09 15:10:26-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/row/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~2a6ccdba41b591a3@1.6, 2007-07-09 15:10:24-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/mach/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~2bd35bda856342@1.8, 2007-07-09 15:10:24-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/os/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~2cee8a309eb8eee2@1.6, 2007-07-09 15:10:25-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/page/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~37bdfb2973b2442b@1.6, 2007-07-09 15:10:26-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/rem/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~3d0553f8aa9c456b@1.6, 2007-07-09 15:10:25-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/read/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~41684e54a5b0d26a@1.6, 2007-07-09 15:10:23-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/log/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~456d34c4816dbda4@1.8, 2007-07-09 15:10:27-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/ut/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~4ae65b009d41d1d@1.7, 2007-07-09 15:10:21-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/eval/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~55504c43d99979e4@1.6, 2007-07-09 15:10:20-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/buf/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~557098c4e5c01ee2@1.6, 2007-07-09 15:10:26-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/thr/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~5aab37bf3b6c430@1.7, 2007-07-09 15:10:22-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/ibuf/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~5ec2ef0d2c35e138@1.6, 2007-07-09 15:10:27-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/usr/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~679131a02af3f6fb@1.6, 2007-07-09 15:10:21-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/fsp/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~6acac9ae30eabdb3@1.6, 2007-07-09 15:10:21-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/dyn/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~79bb55303929b560@1.6, 2007-07-09 15:10:20-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/dict/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~7b0c4abae6684f8c@1.8, 2007-07-09 15:10:25-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/pars/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~7cd88e5f9a8d7ce8@1.7, 2007-07-09 15:10:20-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/data/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~8448688c5ab92132@1.8, 2007-07-09 15:10:24-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/mem/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~a5e6b4385717fcb7@1.6, 2007-07-09 15:10:21-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/fil/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~af2d719bb6e66986@1.3, 2007-07-09 15:10:22-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/handler/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~b5a7a8cfa711b6de@1.6, 2007-07-09 15:10:24-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/mtr/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~d0e0dd55cbd413f0@1.6, 2007-07-09 15:10:25-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/que/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~d25c456e48393313@1.6, 2007-07-09 15:10:27-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/trx/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~e19a1fb29b1fe527@1.7, 2007-07-09 15:10:20-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/btr/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~edd95d7290ddeff3@1.6, 2007-07-09 15:10:23-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/lock/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~f0dbbc7a78648e18@1.6, 2007-07-09 15:10:22-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/ha/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~fdfe12f48c2499af@1.7, 2007-07-09 15:10:26-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/sync/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~feb2280a52035d8d@1.8, 2007-07-09 15:10:26-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/srv/Makefile.am

  BitKeeper/deleted/.del-Makefile.i@1.12, 2007-07-09 15:10:23-06:00, tsmith@sita.local +0 -0
    Delete: storage/innobase/include/Makefile.i

  mysql-test/include/innodb_trx_weight.inc@1.1, 2007-07-09 18:32:20-06:00, tsmith@sita.local +51 -0
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1501:
    Fix Bug#21293: Consider transactions that had edited non-transactional
    tables heavier than ones that had not. This helps killing the "right"
    transaction in case of a deadlock.
    
    Approved by:	Heikki
    
    
    Revision r1556:
    mysql-test/innodb_trx_weight.inc: Add username root to the "connect" statement.
    The Unix user running mysql-test-run usually does not have any privileges
    on the MySQL test database.

  mysql-test/include/innodb_trx_weight.inc@1.0, 2007-07-09 18:32:20-06:00, tsmith@sita.local +0 -0

  mysql-test/r/innodb.result@1.198, 2007-07-09 18:15:58-06:00, tsmith@sita.local +11 -0
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1421:
    Fix the innodb test by shifting some of the contents of the .result file.
    
    Approved by:	Marko
    
    
    Revision r1422:
    Fix for Bug#21101 - returns wrong error message when table column
    defs exceed the max row size.
    
    The fix returns a more appropriate error message. Add a test case to
    innodb.test and expected output to innodb.result.

  mysql-test/r/innodb_trx_weight.result@1.1, 2007-07-09 18:16:01-06:00, tsmith@sita.local +1 -0
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1498:
    Add a test about the behavior introduced in r1497.
    
    
    Revision r1501:
    Fix Bug#21293: Consider transactions that had edited non-transactional
    tables heavier than ones that had not. This helps killing the "right"
    transaction in case of a deadlock.
    
    Approved by:	Heikki

  mysql-test/r/innodb_trx_weight.result@1.0, 2007-07-09 18:16:01-06:00, tsmith@sita.local +0 -0

  mysql-test/t/innodb.test@1.169, 2007-07-09 18:15:58-06:00, tsmith@sita.local +15 -0
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1422:
    Fix for Bug#21101 - returns wrong error message when table column
    defs exceed the max row size.
    
    The fix returns a more appropriate error message. Add a test case to
    innodb.test and expected output to innodb.result.

  mysql-test/t/innodb_trx_weight.test@1.2, 2007-07-10 05:37:37-06:00, tsmith@sita.local +7 -1
    Fixes after merging InnoDB snapshots.
    
    Revision r1498:
    Add a test about the behavior introduced in r1497.
    
    
    Revision r1501:
    Fix Bug#21293: Consider transactions that had edited non-transactional
    tables heavier than ones that had not. This helps killing the "right"
    transaction in case of a deadlock.
    
    Approved by:	Heikki

  mysql-test/t/innodb_trx_weight.test@1.1, 2007-07-09 18:16:01-06:00, tsmith@sita.local +102 -0
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.

  mysql-test/t/innodb_trx_weight.test@1.0, 2007-07-09 18:16:01-06:00, tsmith@sita.local +0 -0

  sql/sql_class.cc@1.335.1.11, 2007-07-10 05:37:37-06:00, tsmith@sita.local +1 -1
    Fixes after merging InnoDB snapshots.

  storage/innobase/Makefile.am@1.29, 2007-07-10 05:37:37-06:00, tsmith@sita.local +2 -2
    Fixes after merging InnoDB snapshots.
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.

  storage/innobase/Makefile.am@1.28, 2007-07-09 18:15:58-06:00, tsmith@sita.local +138 -94
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.

  storage/innobase/btr/btr0btr.c@1.54, 2007-07-09 18:15:59-06:00, tsmith@sita.local +5 -2
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1546:
    When buffering an insert to a prefix index of a variable-length column,
    do not incorrectly mark the column as fixed-length.  (Bug#28138)
    
    ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
    dtype_new_store_for_order_and_null_size().  Add debug assertions.
    
    btr_index_rec_validate(): Correct a comment about prefix indexes.
    
    rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
    debug assertions and comments.
    
    dict_col_type_assert_equal(): New debug function.

  storage/innobase/data/data0data.c@1.23, 2007-07-09 18:15:59-06:00, tsmith@sita.local +2 -0
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1490:
    Add #include <ctype.h>.  Apparently, this header is no longer included by
    the common headers.  This may be related to WL#2936
    (pluggable storage engines).

  storage/innobase/data/data0type.c@1.30, 2007-07-09 18:15:59-06:00, tsmith@sita.local +2 -1
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1513:
    Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
    This makes it possible to see which expression was false by looking at the
    error message.
    
    Approved by:	Marko

  storage/innobase/dict/dict0crea.c@1.45, 2007-07-09 18:15:59-06:00, tsmith@sita.local +2 -1
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1423:
    Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
    of UNDO slots in the rollback segment. This is a partial fix since the
    MySQL error code requested to properly report the error condition back
    to the client has not yet materialized. Currently we have #ifdef'd the
    error code translation in ha_innodb.cc. This will have to be changed
    as and when MySQl add the new requested code or an equivalent code
    that we can then use.
    
    Given the above, currently we will get the old behaviour, not the "fixed"
    and intended behaviour.

  storage/innobase/dict/dict0dict.c@1.106, 2007-07-09 18:15:59-06:00, tsmith@sita.local +13 -6
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1490:
    Add #include <ctype.h>.  Apparently, this header is no longer included by
    the common headers.  This may be related to WL#2936
    (pluggable storage engines).
    
    
    Revision r1513:
    Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
    This makes it possible to see which expression was false by looking at the
    error message.
    
    Approved by:	Marko
    
    
    Revision r1528:
    Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible.
    
    
    Revision r1529:
    Revert r799, which was supposed to prevent similar cases as Bug#21638.
    In reality, the patch breaks the handling of prefix indexes of
    variable-length columns in ROW_FORMAT=COMPACT.  Reverting the patch
    is only a partial fix of Bug#28138.
    
    
    Revision r1535:
    Document that DICT_MAX_INDEX_COL_LEN must not be changed.

  storage/innobase/fsp/fsp0fsp.c@1.37, 2007-07-09 18:15:59-06:00, tsmith@sita.local +7 -4
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1513:
    Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
    This makes it possible to see which expression was false by looking at the
    error message.
    
    Approved by:	Marko
    
    
    Revision r1528:
    Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible.

  storage/innobase/handler/ha_innodb.cc@1.349, 2007-07-10 05:37:37-06:00, tsmith@sita.local +131 -367
    Fixes after merging InnoDB snapshots.
    
    Revision r1422:
    Fix for Bug#21101 - returns wrong error message when table column
    defs exceed the max row size.
    
    The fix returns a more appropriate error message. Add a test case to
    innodb.test and expected output to innodb.result.
    
    
    Revision r1423:
    Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
    of UNDO slots in the rollback segment. This is a partial fix since the
    MySQL error code requested to properly report the error condition back
    to the client has not yet materialized. Currently we have #ifdef'd the
    error code translation in ha_innodb.cc. This will have to be changed
    as and when MySQl add the new requested code or an equivalent code
    that we can then use.
    
    Given the above, currently we will get the old behaviour, not the "fixed"
    and intended behaviour.
    
    
    
    Revision r1425:
    Fixed a missing function decoration that slipped into r1422.
    
    
    Revision r1434:
    Fix typo.
    
    
    Revision r1442:
    Potential fix for Bug#25645:
    
    "Move innobase_release_stat_resources(trx) outside the 'if' in
    ha_innobase::external_lock(). That would add more safety that whatever
    MySQL does at a query end, there would be no risk of a hang on the btr
    search latch."
    
    Also call innobase_release_temporary_latches() in the beginning of
    ha_innobase::close().
    
    Approved by:	Heikki
    
    
    Revision r1453:
    Bugfix: only call innobase_release_temporary_latches() in case of current_thd
    is not NULL, otherwise we get NULL pointer dereferencing.
    
    Approved by:	Heikki
    
    
    Revision r1474:
    Fix typo in comment: the exact prototype is in
    include/data0type.ic, not in data/data0type.ic
    
    
    
    Revision r1482:
    Fix Bug#25078 by always letting the replication thread on the slave
    server to enter InnoDB. This can be made further customizable by the
    user if we introduce a new config parameter. This will wait until
    config parameters can be easily added.
    
    Approved by:	Marko
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1489:
    thd_to_trx(), check_trx_exists(): Remove the handlerton parameter.  It is a
    singleton object whose address is stored into innodb_hton_ptr.
    
    
    Revision r1492:
    Convert innobase_buffer_pool_size and innobase_log_file_size types from
    longlong to long long because MYSQL_SYSVAR_LONGLONG marco expects long long
    type.
    
    Also change
    ((ulint)innobase_buffer_pool_size) / 1024
    to
    (ulint)(innobase_buffer_pool_size / 1024)
    and remove comment which is no longer true.
    
    Provided that innobase_buffer_pool_size is always 64bits these statements
    are equivalent if ulint is 64 bit (well it will screw up if
    innobase_buffer_pool_size is negative). And if ulint is 32 bit the later
    variant gives a little more chance that the value will fit.
    
    Approved by:	Heikki
    
    
    Revision r1493:
    ha_innodb.cc: Remove the declarations of some global InnoDB variables
    whose name starts with srv_.  These variables are declared in the header
    files that are covered by #include directives in ha_innodb.cc.
    
    
    Revision r1495:
    Introduce the function reset_template() for resetting some fields of
    row_prebuilt_t; currently prebuilt->read_just_key and
    prebuilt->keep_other_fields_on_keyread.
    
    
    Revision r1496:
    ha_innobase::extra(): Replace references to prebuilt->trx with
    thd_to_trx(ha_thd()), in order to avoid potential memory corruption.
    
    
    Revision r1501:
    Fix Bug#21293: Consider transactions that had edited non-transactional
    tables heavier than ones that had not. This helps killing the "right"
    transaction in case of a deadlock.
    
    Approved by:	Heikki
    
    
    Revision r1513:
    Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
    This makes it possible to see which expression was false by looking at the
    error message.
    
    Approved by:	Marko
    
    
    Revision r1527:
    Cleanup in ha_innodb.cc:
    
    thd_is_replication_slave_thread(), thd_has_edited_nontrans_tables():
    Remove blank line between the function comment and the function
    definition.  There should be exactly one line between the return
    type and the function comment, and this line should be one of
    '', 'static', 'UNIV_INLINE', and 'extern "C"'.
    
    
    Revision r1538:
    Do not return error in ha_innobase::info if srv_force_recovery >= 4. This is to allow for 
    normal processing of the query by MySQL instead of generating an error.
    
    Reviewed by: Heikki
    
    
    
    Revision r1551:
    ha_innobase::innobase_read_and_init_auto_inc(): Remember and restore
    prebuilt->sql_stat_start.  In an ALTER TABLE statement in the innodb_gis
    test, an ut_ad() assertion failed, because no IX lock had been acquired
    on the table, because prebuilt->sql_stat_start was inadvertently reset
    to FALSE, by this function.  This function was called via
    ha_innobase::info() and mysql_prepare_alter_table().

  storage/innobase/handler/ha_innodb.cc@1.348, 2007-07-09 18:15:59-06:00, tsmith@sita.local +570 -273
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.

  storage/innobase/handler/ha_innodb.h@1.143, 2007-07-10 05:37:38-06:00, tsmith@sita.local +46 -0
    Fixes after merging InnoDB snapshots.
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.

  storage/innobase/handler/ha_innodb.h@1.142, 2007-07-09 18:15:59-06:00, tsmith@sita.local +0 -23
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.

  storage/innobase/ibuf/ibuf0ibuf.c@1.52, 2007-07-09 18:15:59-06:00, tsmith@sita.local +54 -32
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1420:
    Output to the error log information about the limitations of
    UNIV_IBUF_DEBUG.
    
    innobase_start_or_create_for_mysql(): Note that crash recovery is broken
    when UNIV_IBUF_DEBUG is defined.
    
    ibuf_counts[]: Make this a two-dimensional array.  No need to allocate
    anything from the heap.  Eliminate ibuf_counts_inited, as the array
    will be zero-filled by the runtime environment.
    
    ibuf_count_check(): New function, to print out an explanation before
    assertion failure.
    
    
    Revision r1528:
    Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible.
    
    
    Revision r1546:
    When buffering an insert to a prefix index of a variable-length column,
    do not incorrectly mark the column as fixed-length.  (Bug#28138)
    
    ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
    dtype_new_store_for_order_and_null_size().  Add debug assertions.
    
    btr_index_rec_validate(): Correct a comment about prefix indexes.
    
    rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
    debug assertions and comments.
    
    dict_col_type_assert_equal(): New debug function.

  storage/innobase/include/db0err.h@1.14, 2007-07-09 18:15:59-06:00, tsmith@sita.local +5 -0
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1423:
    Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
    of UNDO slots in the rollback segment. This is a partial fix since the
    MySQL error code requested to properly report the error condition back
    to the client has not yet materialized. Currently we have #ifdef'd the
    error code translation in ha_innodb.cc. This will have to be changed
    as and when MySQl add the new requested code or an equivalent code
    that we can then use.
    
    Given the above, currently we will get the old behaviour, not the "fixed"
    and intended behaviour.

  storage/innobase/include/dict0dict.h@1.50, 2007-07-09 18:15:59-06:00, tsmith@sita.local +11 -0
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1546:
    When buffering an insert to a prefix index of a variable-length column,
    do not incorrectly mark the column as fixed-length.  (Bug#28138)
    
    ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
    dtype_new_store_for_order_and_null_size().  Add debug assertions.
    
    btr_index_rec_validate(): Correct a comment about prefix indexes.
    
    rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
    debug assertions and comments.
    
    dict_col_type_assert_equal(): New debug function.

  storage/innobase/include/dict0dict.ic@1.21, 2007-07-09 18:15:59-06:00, tsmith@sita.local +24 -0
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1546:
    When buffering an insert to a prefix index of a variable-length column,
    do not incorrectly mark the column as fixed-length.  (Bug#28138)
    
    ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
    dtype_new_store_for_order_and_null_size().  Add debug assertions.
    
    btr_index_rec_validate(): Correct a comment about prefix indexes.
    
    rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
    debug assertions and comments.
    
    dict_col_type_assert_equal(): New debug function.

  storage/innobase/include/dict0mem.h@1.33, 2007-07-09 18:16:00-06:00, tsmith@sita.local +7 -4
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1535:
    Document that DICT_MAX_INDEX_COL_LEN must not be changed.
    
    
    Revision r1536:
    Change the comment to a more appropriate one. Discussed with Heikki on IM.
    
    Approved by:	Heikki

  storage/innobase/include/ha_prototypes.h@1.2, 2007-07-09 18:16:00-06:00, tsmith@sita.local +29 -0
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1482:
    Fix Bug#25078 by always letting the replication thread on the slave
    server to enter InnoDB. This can be made further customizable by the
    user if we introduce a new config parameter. This will wait until
    config parameters can be easily added.
    
    Approved by:	Marko
    
    
    Revision r1501:
    Fix Bug#21293: Consider transactions that had edited non-transactional
    tables heavier than ones that had not. This helps killing the "right"
    transaction in case of a deadlock.
    
    Approved by:	Heikki

  storage/innobase/include/os0file.h@1.47, 2007-07-09 18:16:00-06:00, tsmith@sita.local +2 -1
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1431:
    Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or
    ERROR_LOCK_VIOLATION is encountered during file operation.
    This is caused by backup software, so InnoDB should retry while the backup
    software is done with the file.
    
    Approved by:	Heikki

  storage/innobase/include/rem0rec.ic@1.30, 2007-07-09 18:16:00-06:00, tsmith@sita.local +4 -2
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1569:
    Fix some in:/out: comments.
    
    Approved by:	Marko

  storage/innobase/include/row0mysql.h@1.51, 2007-07-09 18:16:00-06:00, tsmith@sita.local +13 -0
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1422:
    Fix for Bug#21101 - returns wrong error message when table column
    defs exceed the max row size.
    
    The fix returns a more appropriate error message. Add a test case to
    innodb.test and expected output to innodb.result.

  storage/innobase/include/trx0trx.h@1.58, 2007-07-09 18:16:00-06:00, tsmith@sita.local +30 -6
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1462:
    Fix typo in comment.
    
    
    Revision r1486:
    Improve the comment for trx_struct::undo_no.
    
    Suggested by:	Heikki
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1497:
    Add the number of locks acquired by a transaction to its weight when
    choosing the lightest transaction to kill when a deadlock occurs.
    This fixes Bug#21293 partially.
    
    Approved by:	Heikki
    
    
    
    Revision r1501:
    Fix Bug#21293: Consider transactions that had edited non-transactional
    tables heavier than ones that had not. This helps killing the "right"
    transaction in case of a deadlock.
    
    Approved by:	Heikki

  storage/innobase/include/trx0undo.h@1.10, 2007-07-09 18:16:00-06:00, tsmith@sita.local +8 -5
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1423:
    Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
    of UNDO slots in the rollback segment. This is a partial fix since the
    MySQL error code requested to properly report the error condition back
    to the client has not yet materialized. Currently we have #ifdef'd the
    error code translation in ha_innodb.cc. This will have to be changed
    as and when MySQl add the new requested code or an equivalent code
    that we can then use.
    
    Given the above, currently we will get the old behaviour, not the "fixed"
    and intended behaviour.

  storage/innobase/include/ut0ut.h@1.24, 2007-07-09 18:16:00-06:00, tsmith@sita.local +5 -0
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1528:
    Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible.

  storage/innobase/lock/lock0lock.c@1.78, 2007-07-09 18:16:00-06:00, tsmith@sita.local +7 -10
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1457:
    Fix Bug#22819, remove assertion. (http://bugs.mysql.com/bug.php?id=22819)
    
    
    Revision r1497:
    Add the number of locks acquired by a transaction to its weight when
    choosing the lightest transaction to kill when a deadlock occurs.
    This fixes Bug#21293 partially.
    
    Approved by:	Heikki
    
    
    
    Revision r1513:
    Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
    This makes it possible to see which expression was false by looking at the
    error message.
    
    Approved by:	Marko

  storage/innobase/log/log0log.c@1.56, 2007-07-09 18:16:00-06:00, tsmith@sita.local +16 -18
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1521:
    Forward port r1520 from branches/5.0
    
    Patch to allow monitor threads to stop before proceeding with normal shutdown. 
    Also have a separate time counter for tablespace monitor.
    
    reviewed by: Heikki
    
    
    Revision r1524:
    Undo bad space formatting introduced in earlier commit r1521
    
    spotted by: Marko
    
    
    Revision r1533:
    logs_empty_and_mark_files_at_shutdown(): Remove trailing whitespace that
    was added in r1521.

  storage/innobase/os/os0file.c@1.130, 2007-07-09 18:16:00-06:00, tsmith@sita.local +16 -0
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1431:
    Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or
    ERROR_LOCK_VIOLATION is encountered during file operation.
    This is caused by backup software, so InnoDB should retry while the backup
    software is done with the file.
    
    Approved by:	Heikki

  storage/innobase/plug.in@1.7, 2007-07-10 05:37:37-06:00, tsmith@sita.local +0 -2
    Fixes after merging InnoDB snapshots.
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.

  storage/innobase/plug.in@1.6, 2007-07-09 18:15:59-06:00, tsmith@sita.local +2 -31
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.

  storage/innobase/rem/rem0rec.c@1.23, 2007-07-09 18:16:00-06:00, tsmith@sita.local +27 -13
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1528:
    Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible.
    
    
    Revision r1531:
    rec_get_converted_size_new(): Simplify and move a debug assertion.
    
    
    Revision r1546:
    When buffering an insert to a prefix index of a variable-length column,
    do not incorrectly mark the column as fixed-length.  (Bug#28138)
    
    ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
    dtype_new_store_for_order_and_null_size().  Add debug assertions.
    
    btr_index_rec_validate(): Correct a comment about prefix indexes.
    
    rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
    debug assertions and comments.
    
    dict_col_type_assert_equal(): New debug function.
    
    
    Revision r1555:
    rec_get_converted_size_new(): The total size of the infimum and supremum
    records in ROW_FORMAT=COMPACT is REC_N_NEW_EXTRA_BYTES + 8.  The
    REC_N_NEW_EXTRA_BYTES was accidentally omitted in r1546.  This function
    should never be called on those records, though.
    
    
    Revision r1569:
    Fix some in:/out: comments.
    
    Approved by:	Marko

  storage/innobase/row/row0ins.c@1.84, 2007-07-09 18:16:00-06:00, tsmith@sita.local +20 -26
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1485:
    Minor cleanup.
    
    row_ins_check_foreign_constraint(), row_ins_scan_sec_index_for_duplicate():
    Make use of the predicates page_rec_is_infimum() and page_rec_is_supremum().
    
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1513:
    Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
    This makes it possible to see which expression was false by looking at the
    error message.
    
    Approved by:	Marko

  storage/innobase/row/row0mysql.c@1.141, 2007-07-09 18:16:00-06:00, tsmith@sita.local +24 -1
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1422:
    Fix for Bug#21101 - returns wrong error message when table column
    defs exceed the max row size.
    
    The fix returns a more appropriate error message. Add a test case to
    innodb.test and expected output to innodb.result.
    
    
    Revision r1423:
    Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
    of UNDO slots in the rollback segment. This is a partial fix since the
    MySQL error code requested to properly report the error condition back
    to the client has not yet materialized. Currently we have #ifdef'd the
    error code translation in ha_innodb.cc. This will have to be changed
    as and when MySQl add the new requested code or an equivalent code
    that we can then use.
    
    Given the above, currently we will get the old behaviour, not the "fixed"
    and intended behaviour.

  storage/innobase/row/row0row.c@1.26, 2007-07-09 18:16:01-06:00, tsmith@sita.local +10 -13
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1513:
    Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
    This makes it possible to see which expression was false by looking at the
    error message.
    
    Approved by:	Marko
    
    
    Revision r1529:
    Revert r799, which was supposed to prevent similar cases as Bug#21638.
    In reality, the patch breaks the handling of prefix indexes of
    variable-length columns in ROW_FORMAT=COMPACT.  Reverting the patch
    is only a partial fix of Bug#28138.

  storage/innobase/row/row0sel.c@1.117, 2007-07-09 18:16:01-06:00, tsmith@sita.local +26 -0
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1452:
    Fix phantom reads (http://bugs.mysql.com/27197) following Heikki's
    patch in the bug followup.
    
    Approved by:	Heikki
    
    
    
    Revision r1455:
    Reindent with tabs instead of spaces.
    
    Spotted by:	Marko

  storage/innobase/srv/srv0srv.c@1.107, 2007-07-09 18:16:01-06:00, tsmith@sita.local +41 -9
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1424:
    Bug#20352. Added variable srv_insert_buffer_batch_size. We want to make
    this variable settable. Since the pluggable engine interface currently
    doesn't provide a usable mechanism, we will add the latter functionality
    once it's available.
    
    
    Revision r1426:
    Fix code indentation from r1424.
    
    
    Revision r1459:
    Fix typo in the comment.
    
    
    Revision r1482:
    Fix Bug#25078 by always letting the replication thread on the slave
    server to enter InnoDB. This can be made further customizable by the
    user if we introduce a new config parameter. This will wait until
    config parameters can be easily added.
    
    Approved by:	Marko
    
    
    Revision r1487:
    Fix typo in comment.
    
    Spotted by:	Marko
    
    
    Revision r1521:
    Forward port r1520 from branches/5.0
    
    Patch to allow monitor threads to stop before proceeding with normal shutdown. 
    Also have a separate time counter for tablespace monitor.
    
    reviewed by: Heikki
    
    
    Revision r1532:
    srv_lock_timeout_and_monitor_thread(): Correct the indentation that was
    broken in r1521.
    
    
    Revision r1553:
    Fix Bug#20090 as suggested in the bug followup by Heikki.
    
    Approved by:	Heikki

  storage/innobase/srv/srv0start.c@1.105, 2007-07-09 18:16:01-06:00, tsmith@sita.local +6 -0
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1420:
    Output to the error log information about the limitations of
    UNIV_IBUF_DEBUG.
    
    innobase_start_or_create_for_mysql(): Note that crash recovery is broken
    when UNIV_IBUF_DEBUG is defined.
    
    ibuf_counts[]: Make this a two-dimensional array.  No need to allocate
    anything from the heap.  Eliminate ibuf_counts_inited, as the array
    will be zero-filled by the runtime environment.
    
    ibuf_count_check(): New function, to print out an explanation before
    assertion failure.

  storage/innobase/sync/sync0arr.c@1.29, 2007-07-09 18:16:01-06:00, tsmith@sita.local +3 -1
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1513:
    Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
    This makes it possible to see which expression was false by looking at the
    error message.
    
    Approved by:	Marko

  storage/innobase/trx/trx0rec.c@1.28, 2007-07-09 18:16:01-06:00, tsmith@sita.local +11 -8
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1423:
    Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
    of UNDO slots in the rollback segment. This is a partial fix since the
    MySQL error code requested to properly report the error condition back
    to the client has not yet materialized. Currently we have #ifdef'd the
    error code translation in ha_innodb.cc. This will have to be changed
    as and when MySQl add the new requested code or an equivalent code
    that we can then use.
    
    Given the above, currently we will get the old behaviour, not the "fixed"
    and intended behaviour.

  storage/innobase/trx/trx0trx.c@1.74, 2007-07-09 18:16:01-06:00, tsmith@sita.local +59 -1
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1488:
    Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
    and adapt some things.
    
    Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
    <mysql/plugin.h>.  Until the function is declared there, you can
    uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
    
    Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
    storage/innobase/Makefile.am and storage/innobase/plug.in.
    
    plug.in: Declare InnoDB as a dynamic plugin.
    
    ha_innodb.h: Remove the declarations of many global variables.  The variables
    are no longer directly referenced outside of storage/innobase.
    
    trx_t: Add the field trx->duplicates.
    
    trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
    
    innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
    
    
    Revision r1491:
    Fix typo in comment.
    
    
    Revision r1497:
    Add the number of locks acquired by a transaction to its weight when
    choosing the lightest transaction to kill when a deadlock occurs.
    This fixes Bug#21293 partially.
    
    Approved by:	Heikki
    
    
    
    Revision r1501:
    Fix Bug#21293: Consider transactions that had edited non-transactional
    tables heavier than ones that had not. This helps killing the "right"
    transaction in case of a deadlock.
    
    Approved by:	Heikki
    
    
    Revision r1522:
    trx0trx.c: Add missing #include "ha_prototypes.h".

  storage/innobase/trx/trx0undo.c@1.30, 2007-07-09 18:16:01-06:00, tsmith@sita.local +62 -39
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1423:
    Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
    of UNDO slots in the rollback segment. This is a partial fix since the
    MySQL error code requested to properly report the error condition back
    to the client has not yet materialized. Currently we have #ifdef'd the
    error code translation in ha_innodb.cc. This will have to be changed
    as and when MySQl add the new requested code or an equivalent code
    that we can then use.
    
    Given the above, currently we will get the old behaviour, not the "fixed"
    and intended behaviour.

  storage/innobase/ut/ut0ut.c@1.41, 2007-07-09 18:16:01-06:00, tsmith@sita.local +1 -0
    Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
    
    Revision r1490:
    Add #include <ctype.h>.  Apparently, this header is no longer included by
    the common headers.  This may be related to WL#2936
    (pluggable storage engines).

ChangeSet@1.2529.6.7, 2007-07-10 15:37:39+05:00, svoj@mysql.com +3 -0
  BUG#29445 - match ... against () never returns
  
  Part 1:
  Do not perform index search for a plus-word with truncation operator
  in case there are other plus-words in expression.
  
  Specifically this optimization was enforced for expression like
  "+word1 +word2*", but wasn't enforced for expression like
  "+word1 word2*".

  mysql-test/r/fulltext.result@1.94, 2007-07-10 15:37:37+05:00, svoj@mysql.com +6 -0
    A test case for BUG#29445.

  mysql-test/t/fulltext.test@1.86, 2007-07-10 15:37:37+05:00, svoj@mysql.com +8 -0
    A test case for BUG#29445.

  storage/myisam/ft_boolean_search.c@1.110, 2007-07-10 15:37:37+05:00, svoj@mysql.com +2 -1
    Do not perform index search for a plus-word with truncation operator
    in case there are other plus-words in expression.
    
    Specifically this optimization was enforced for expression like
    "+word1 +word2*", but wasn't enforced for expression like
    "+word1 word2*".

ChangeSet@1.2529.15.1, 2007-07-10 13:09:07+05:00, ramil@mysql.com +3 -0
  Fix for bug #29652: csv.test failure: two changes conflict after merge
  
  Problem: we don't take into account the length of the data written
  to the temporary data file during update on a CSV table.
  
  Fix: properly calculate the data file length during update.

  mysql-test/r/csv.result@1.22, 2007-07-10 13:09:05+05:00, ramil@mysql.com +2 -0
    Fix for bug #29652: csv.test failure: two changes conflict after merge
      - test result adjusted.

  storage/csv/ha_tina.cc@1.81, 2007-07-10 13:09:06+05:00, ramil@mysql.com +13 -2
    Fix for bug #29652: csv.test failure: two changes conflict after merge
      - adjust local_saved_data_file_length in case of update as well.

  storage/csv/ha_tina.h@1.31, 2007-07-10 13:09:06+05:00, ramil@mysql.com +1 -0
    Fix for bug #29652: csv.test failure: two changes conflict after merge
      - adjust local_saved_data_file_length in case of update as well.

ChangeSet@1.1810.3147.1, 2007-07-10 10:43:12+03:00, gkodinov@magare.gmz +2 -0
  Bug #29469: Client dies if a query is issued after hitting Ctrl + C
  The Ctrl-C handler in mysql closes the console while ReadConsole()
  waits for console input.
  But the main thread was detecting that ReadConsole() haven't read 
  anything and was processing as if there're data in the buffer.
  Fixed to handle correctly this error condition.
  No test case added as the test relies on Ctrl-C sent to the client
  from its console.

  client/mysql.cc@1.199.1.40, 2007-07-10 10:43:10+03:00, gkodinov@magare.gmz +6 -1
    Bug #29469: handle correctly console read error

  mysys/my_conio.c@1.3.1.1, 2007-07-10 10:43:10+03:00, gkodinov@magare.gmz +5 -2
    Bug #29469: 
     1. handle correctly console read error
     2. add boundry checks for console buffer.

ChangeSet@1.2529.14.4, 2007-07-10 09:00:15+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  Bug #29570
  - correct result files

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.13.1.4, 2007-07-10 09:00:13+02:00, tomas@whalegate.ndb.mysql.com +2 -2
    Bug #29570
    - correct result files

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.10.1.4, 2007-07-10 09:00:13+02:00, tomas@whalegate.ndb.mysql.com +2 -2
    Bug #29570
    - correct result files

ChangeSet@1.2529.2.16, 2007-07-09 16:10:43-06:00, tsmith@sita.local +1 -0
  Bug #29634: mysqld_safe does not set err_log variable, error log file is not created
  
  Dont touch & chmod the err_log file if using syslog (mysqld_safe)

  scripts/mysqld_safe.sh@1.90, 2007-07-09 16:09:19-06:00, tsmith@sita.local +19 -16
    Dont touch & chmod the err_log file if using syslog

ChangeSet@1.2529.2.14, 2007-07-09 15:30:19-06:00, tsmith@sita.local +1 -0
  mysqld_safe.sh:
    Fix a few typos in comments (from Paul DuBois)

  scripts/mysqld_safe.sh@1.89, 2007-07-09 15:30:01-06:00, tsmith@sita.local +2 -2
    Fix a few typos in comments (from Paul DuBois)

ChangeSet@1.1810.3146.1, 2007-07-09 13:18:27-06:00, tsmith@sita.local +2 -0
  rpl_misc_functions.result, rpl_misc_functions.test:
    Backport from 5.1 a fix to make this test deterministic

  mysql-test/r/rpl_misc_functions.result@1.4.2.1, 2007-07-09 13:18:11-06:00, tsmith@sita.local +10 -9
    Backport from 5.1 a fix to make this test deterministic

  mysql-test/t/rpl_misc_functions.test@1.5.2.1, 2007-07-09 13:18:11-06:00, tsmith@sita.local +12 -11
    Backport from 5.1 a fix to make this test deterministic

ChangeSet@1.1810.3145.1, 2007-07-09 17:41:24+03:00, gkodinov@magare.gmz +3 -0
  Bug #29070: Error in spatial index
  1. Threat MBR for a key as double[] and convert it only
  when about to store it on disk.
  2. Remove the redundant function get_double().

  mysql-test/r/gis-rtree.result@1.14.1.13, 2007-07-09 17:41:23+03:00, gkodinov@magare.gmz +13 -0
    Bug #29070: test case

  mysql-test/t/gis-rtree.test@1.18.1.4, 2007-07-09 17:41:23+03:00, gkodinov@magare.gmz +19 -0
    Bug #29070: test case

  myisam/sp_key.c@1.8.4.1, 2007-07-09 17:41:22+03:00, gkodinov@magare.gmz +29 -42
    Bug #29070: 
    1. threat MBR for a key as double[] and convert it only
    when about to store it on disk.
    2. remove the redundant function get_double()

ChangeSet@1.2529.2.10, 2007-07-09 03:31:27-06:00, tsmith@sita.local +1 -0
  disabled.def:
    post-merge fix: re-enable rpl_udf test

  mysql-test/suite/rpl/t/disabled.def@1.4, 2007-07-09 03:31:16-06:00, tsmith@sita.local +0 -1
    post-merge fix: re-enable rpl_udf test

ChangeSet@1.2482.8.56, 2007-07-09 09:35:27+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  Bug #29570
  - correct result files

  mysql-test/r/rpl_row_tabledefs_2myisam.result@1.11.2.1, 2007-07-09 09:35:25+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug #29570
    - correct result files

  mysql-test/r/rpl_row_tabledefs_3innodb.result@1.8.2.1, 2007-07-09 09:35:25+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug #29570
    - correct result files

ChangeSet@1.1810.3144.1, 2007-07-09 08:11:38+02:00, tnurnberg@mysql.com +3 -0
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  dollin' it up for Guilhem ;) -- test streamlined,
  better comments, faster code, add'l assert.

  mysql-test/t/binlog.test@1.4.12.1, 2007-07-09 08:11:36+02:00, tnurnberg@mysql.com +0 -61
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    streamlined test

  mysql-test/r/binlog.result@1.4.10.1, 2007-07-09 08:11:36+02:00, tnurnberg@mysql.com +0 -97
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    streamlined test

  sql/log.cc@1.158.1.59, 2007-07-09 08:11:36+02:00, tnurnberg@mysql.com +9 -7
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    comment clarified

ChangeSet@1.2529.2.8, 2007-07-09 10:39:49+05:00, ramil@mysql.com +1 -0
  after-merge fix.

  mysql-test/r/show_check.result@1.113.1.5, 2007-07-09 10:39:45+05:00, ramil@mysql.com +31 -1
    after-merge fix.

ChangeSet@1.1810.3141.1, 2007-07-09 01:23:33+04:00, evgen@moonbone.local +3 -0
  Bug#29461: Sort order of the collation wasn't used when comparing characters
  with the space character.
  
  When the my_strnncollsp_simple function compares two strings and one is a prefix
  of another then this function compares characters in the rest of longer key
  with the space character to find whether the longer key is greater or less.
  But the sort order of the collation isn't used in this comparison. This may
  lead to a wrong comparison result, wrongly created index or wrong order of the
  result set of a query with the ORDER BY clause.
  
  Now the my_strnncollsp_simple function uses collation sort order to compare
  the characters in the rest of longer key with the space character.

  mysql-test/r/ctype_collate.result@1.31.1.2, 2007-07-09 01:21:22+04:00, evgen@moonbone.local +8 -0
    Added a test case for the bug#29461: Sort order of the collation wasn't used when
    comparing characters with the space character.

  mysql-test/t/ctype_collate.test@1.22, 2007-07-09 01:20:24+04:00, evgen@moonbone.local +11 -0
    Added a test case for the bug#29461: Sort order of the collation wasn't used when
    comparing characters with the space character.

  strings/ctype-simple.c@1.75.1.9, 2007-07-09 01:21:39+04:00, evgen@moonbone.local +1 -1
    Bug#29461: Sort order of the collation wasn't used when comparing characters
    with the space character.Now the my_strnncollsp_simple function uses collation sort order to compare
    the characters in the rest of longer key with the space character.

ChangeSet@1.2529.12.1, 2007-07-08 18:13:04+04:00, evgen@moonbone.local +4 -0
  Bug#29310: An InnoDB table was updated when the data wasn't actually changed.
  
  When a table is being updated it has two set of fields - fields required for
  checks of conditions and fields to be updated. A storage engine is allowed
  not to retrieve columns marked for update. Due to this fact records can't
  be compared to see whether the data has been changed or not. This makes the
  server always update records independently of data change.
  
  Now when an auto-updatable timestamp field is present and server sees that
  a table handle isn't going to retrieve write-only fields then all of such
  fields are marked as to be read to force the handler to retrieve them.

  mysql-test/include/mix1.inc@1.39.1.1, 2007-07-08 18:11:43+04:00, evgen@moonbone.local +24 -0
    Added a test case for the bug#29310: An InnoDB table was updated when the data wasn't actually changed.

  mysql-test/r/innodb_mysql.result@1.41.1.1, 2007-07-08 18:11:41+04:00, evgen@moonbone.local +28 -0
    Added a test case for the bug#29310: An InnoDB table was updated when the data wasn't actually changed.

  sql/sql_insert.cc@1.280.1.1, 2007-07-08 18:12:45+04:00, evgen@moonbone.local +2 -1
    Bug#29310: An InnoDB table was updated when the data wasn't actually changed.
    Now the write_record function can compare records when fileds to be written is
    a subset of the fields to be read while updating a record.

  sql/sql_update.cc@1.250, 2007-07-08 18:11:44+04:00, evgen@moonbone.local +11 -0
    Bug#29310: An InnoDB table was updated when the data wasn't actually changed.
    Now the mysql_update function when an auto-updatable timestamp field is
    present marks write-only fields as to be read to force the table handler
    to retrieve them.

ChangeSet@1.2529.11.2, 2007-07-07 20:03:00-07:00, igor@olga.mysql.com +2 -0
  Post-merge fix.

  mysql-test/r/type_newdecimal.result@1.61, 2007-07-07 20:02:55-07:00, igor@olga.mysql.com +28 -0
    Post-merge fix.

  sql/item_create.cc@1.86, 2007-07-07 20:02:55-07:00, igor@olga.mysql.com +12 -0
    Post-merge fix.

ChangeSet@1.1810.3139.1, 2007-07-07 12:31:55-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #29417.
  An assertion abort could occur for some grouping queries that employed 
  decimal user variables with assignments to them.
  
  The problem appeared the constructors of the class Field_new_decimal
  because the function my_decimal_length_to_precision did not guarantee
  returning decimal precision not greater than DECIMAL_MAX_PRECISION.

  mysql-test/r/type_newdecimal.result@1.36.5.1, 2007-07-07 12:31:48-07:00, igor@olga.mysql.com +8 -0
    Added a test case for bug #29417.

  mysql-test/t/type_newdecimal.test@1.33.7.1, 2007-07-07 12:31:48-07:00, igor@olga.mysql.com +13 -0
    Added a test case for bug #29417.

  sql/field.cc@1.256.57.1, 2007-07-07 12:31:48-07:00, igor@olga.mysql.com +2 -0
    Fixed bug #29417.
    An assertion abort could occur for some grouping queries that employed 
    decimal user variables with assignments to them.
    
    The problem appeared the constructors of the class Field_new_decimal
    because the function my_decimal_length_to_precision did not guarantee
    returning decimal precision not greater than DECIMAL_MAX_PRECISION.
    
    Now if the precision returned by calls to my_decimal_length_to_precision
    in the constructors of the class Field_new_decimal is greater than 
    DECIMAL_MAX_PRECISION the precision is set to this value.

ChangeSet@1.1810.3128.5, 2007-07-07 10:33:02-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #29415.
  The cast operation ignored the cases when the precision and/or the scale exceeded
  the limits, 65 and 30 respectively. No errors were reported in these cases.
  For some queries this may lead to an assertion abort.
  
  Fixed by throwing errors for such cases.

  mysql-test/r/type_newdecimal.result@1.36.1.13, 2007-07-07 10:32:49-07:00, igor@olga.mysql.com +20 -0
    Added a test case for bug #29415.

  mysql-test/t/type_newdecimal.test@1.33.1.14, 2007-07-07 10:32:49-07:00, igor@olga.mysql.com +23 -0
    Added a test case for bug #29415.
    

  sql/item_create.cc@1.58.1.7, 2007-07-07 10:32:49-07:00, igor@olga.mysql.com +12 -0
    Fixed bug #29415.
    The cast operation ignored the cases when the precision and/or the scale exceeded
    the limits, 65 and 30 respectively. No errors were reported in these cases.
    For some queries this may lead to an assertion abort.
    
    Fixed by throwing errors for such cases.

ChangeSet@1.2529.10.1, 2007-07-07 09:28:35-07:00, antony@ppcg5.local +1 -0
  disable federated_innodb test until bug29522 is fixed

  mysql-test/t/disabled.def@1.266.5.2, 2007-07-07 09:28:31-07:00, antony@ppcg5.local +1 -0
    disable federated_innodb test until bug29522 is fixed

ChangeSet@1.1810.3113.3, 2007-07-07 15:08:21+02:00, df@pippilotta.erinye.com +1 -0
  revert previous patch

  scripts/make_binary_distribution.sh@1.101.9.2, 2007-07-07 15:08:20+02:00, df@pippilotta.erinye.com +4 -1
    revert previous patch

ChangeSet@1.1810.3133.3, 2007-07-07 07:46:17+02:00, knielsen@ymer.(none) +2 -0
  Bug #29543 GCov information not written in case of crash.
  
  For GCov builds, if the server crashes, the normal exit handler for writing
  coverage information is not executed due to the abnormal termination.
  
  Fix this by explicitly calling the __gcov_flush function in our crash handler.

  BUILD/compile-pentium-gcov@1.14.2.2, 2007-07-07 07:46:13+02:00, knielsen@ymer.(none) +3 -2
    Bug #29543 GCov information not written in case of crash.
    
    For GCov builds, if the server crashes, the normal exit handler for writing
    coverage information is not executed due to the abnormal termination.
    
    Fix this by explicitly calling the __gcov_flush function in our crash handler.

  sql/stacktrace.c@1.18.1.6, 2007-07-07 07:46:14+02:00, knielsen@ymer.(none) +9 -0
    Bug #29543 GCov information not written in case of crash.
    
    For GCov builds, if the server crashes, the normal exit handler for writing
    coverage information is not executed due to the abnormal termination.
    
    Fix this by explicitly calling the __gcov_flush function in our crash handler.

ChangeSet@1.1810.3135.3, 2007-07-06 11:35:10-07:00, antony@ppcg5.local +4 -0
  fix test for bug29299

  mysql-test/r/fulltext2.result@1.13.1.2, 2007-07-06 11:35:02-07:00, antony@ppcg5.local +0 -12
    fix test for bug29299

  mysql-test/r/fulltext3.result@1.1, 2007-07-06 11:35:02-07:00, antony@ppcg5.local +13 -0
    fix test for bug29299

  mysql-test/r/fulltext3.result@1.0, 2007-07-06 11:35:02-07:00, antony@ppcg5.local +0 -0

  mysql-test/t/fulltext2.test@1.14.1.2, 2007-07-06 11:35:02-07:00, antony@ppcg5.local +0 -12
    fix test for bug29299

  mysql-test/t/fulltext3.test@1.1, 2007-07-06 11:35:02-07:00, antony@ppcg5.local +24 -0
    fix test for bug29299

  mysql-test/t/fulltext3.test@1.0, 2007-07-06 11:35:02-07:00, antony@ppcg5.local +0 -0

ChangeSet@1.2537, 2007-07-06 19:04:11+02:00, tomas@whalegate.ndb.mysql.com +37 -0
  WL#3303
  - row based ndb logging also in mixed

  mysql-test/t/ndb_autodiscover3.test@1.14.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/ndb_binlog_basic.test@1.5.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/ndb_binlog_ddl_multi.test@1.15.2.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/ndb_binlog_discover.test@1.5.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/ndb_binlog_ignore_db.test@1.5.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/ndb_binlog_log_bin.test@1.5.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/ndb_binlog_multi.test@1.11.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/ndb_multi_row.test@1.4.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_UUID.test@1.2.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_bank.test@1.11.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_basic.test@1.14.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_blob.test@1.5.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_blob2.test@1.2.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_circular.test@1.2.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_circular_simplex.test@1.5.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_dd_advance.test@1.13.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_dd_basic.test@1.7.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_dd_partitions.test@1.2.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_ddl.test@1.6.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_delete_nowhere.test@1.4.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_do_db.test@1.3.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_do_table.test@1.5.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_extraCol.test@1.2.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_func003.test@1.3.1.1, 2007-07-06 19:04:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_idempotent.test@1.9.1.1, 2007-07-06 19:04:08+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_insert_ignore.test@1.4.1.1, 2007-07-06 19:04:08+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_multi.test@1.5.1.1, 2007-07-06 19:04:08+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_multi_update2.test@1.3.1.1, 2007-07-06 19:04:08+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_multi_update3.test@1.3.1.1, 2007-07-06 19:04:08+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_rep_ignore.test@1.3.1.1, 2007-07-06 19:04:08+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_row_001.test@1.2.1.1, 2007-07-06 19:04:08+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_sp003.test@1.2.1.1, 2007-07-06 19:04:08+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_sp006.test@1.3.1.1, 2007-07-06 19:04:08+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_sync.test@1.14.1.1, 2007-07-06 19:04:08+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_trig004.test@1.2.1.1, 2007-07-06 19:04:08+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndbapi_multi.test@1.3.1.1, 2007-07-06 19:04:08+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_row_basic_7ndb.test@1.4.1.1, 2007-07-06 19:04:08+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    WL#3303
    - row based ndb logging also in mixed

ChangeSet@1.1810.3134.1, 2007-07-06 16:18:49+04:00, kostja@bodhi.(none) +11 -0
  Remove typedef st_table_list TABLE_LIST and always use name 'TABLE_LIST'.
  The need arose when working on Bug 26141, where it became
  necessary to replace TABLE_LIST with its forward declaration in a few
  headers, and this involved a lot of s/TABLE_LIST/st_table_list/.
  Although other workarounds exist, this patch is in line
  with our general strategy of moving away from typedef-ed names.
  Sometime in future we might also rename TABLE_LIST to follow the
  coding style, but this is a huge change.

  sql/item.cc@1.113.1.163, 2007-07-06 16:18:44+04:00, kostja@bodhi.(none) +1 -1
    st_table_list -> TABLE_LIST

  sql/item.h@1.183.37.1, 2007-07-06 16:18:44+04:00, kostja@bodhi.(none) +1 -1
    st_table_list -> TABLE_LIST

  sql/mysql_priv.h@1.290.1.167, 2007-07-06 16:18:44+04:00, kostja@bodhi.(none) +3 -3
    st_table_list -> TABLE_LIST

  sql/sql_base.cc@1.235.1.149, 2007-07-06 16:18:44+04:00, kostja@bodhi.(none) +1 -1
    st_table_list -> TABLE_LIST

  sql/sql_lex.cc@1.142.42.1, 2007-07-06 16:18:44+04:00, kostja@bodhi.(none) +1 -1
    st_table_list -> TABLE_LIST

  sql/sql_lex.h@1.175.41.1, 2007-07-06 16:18:45+04:00, kostja@bodhi.(none) +1 -1
    st_table_list -> TABLE_LIST

  sql/sql_select.cc@1.312.1.226, 2007-07-06 16:18:45+04:00, kostja@bodhi.(none) +2 -2
    st_table_list -> TABLE_LIST

  sql/sql_show.cc@1.253.53.1, 2007-07-06 16:18:45+04:00, kostja@bodhi.(none) +7 -7
    st_table_list -> TABLE_LIST

  sql/sql_udf.h@1.18, 2007-07-06 16:18:45+04:00, kostja@bodhi.(none) +0 -1
    Was not needed.

  sql/table.cc@1.160.1.93, 2007-07-06 16:18:45+04:00, kostja@bodhi.(none) +46 -46
    st_table_list -> TABLE_LIST

  sql/table.h@1.102.1.43, 2007-07-06 16:18:45+04:00, kostja@bodhi.(none) +30 -30
    st_table_list -> TABLE_LIST

ChangeSet@1.2482.8.55, 2007-07-06 12:39:03+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #29570 original error lost in write_event on slave
  - make sure error gets propagated to thd->net by calling print_error
  - also print the full error message

  sql/log_event.cc@1.278.3.1, 2007-07-06 12:38:59+02:00, tomas@whalegate.ndb.mysql.com +12 -5
    Bug #29570 original error lost in write_event on slave
    - make sure error gets propagated to thd->net by calling print_error
    - also print the full error message

ChangeSet@1.2482.113.2, 2007-07-06 16:58:56+08:00, Justin.He@dev3-240.dev.cn.tlan +1 -0
  update some description in t/disable.def for testcase rpl_ndb_innodb2ndb and rpl_ndb_myisam2ndb

  mysql-test/t/disabled.def@1.253.6.1, 2007-07-06 16:58:47+08:00, Justin.He@dev3-240.dev.cn.tlan +2 -2
    correct related bug, bug#29549 discovers more accurate reason

ChangeSet@1.1810.3132.1, 2007-07-06 03:43:23+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #29442.
  The SELECT INTO OUTFILE FIELDS ENCLOSED BY digit or minus sign,
  followed by the same LOAD DATA INFILE statement, used wrond encoding
  of non-string fields contained the enclosed character in their text
  representation.
  
  Example:
    SELECT 15, 9 INTO OUTFILE 'text' FIELDS ENCLOSED BY '5';
  
  Old encoded result in the text file:
    5155 595
           ^ was decoded as the 1st enclosing character of the 2nd field;
          ^ was skipped as garbage;
    ^    ^ was decoded as a pair of englosing characters of the 1st field;
        ^   was decoded as traling space of the first field;
      ^^ was decoded as a doubled enclosed character.
  
  New encoded result in the text file:
    51\55 595
    ^   ^ pair of enclosing characters of the 1st field;
      ^^ escaped enclosed character.
  

  mysql-test/r/loaddata.result@1.20.1.12, 2007-07-06 03:43:11+05:00, gshchepa@gleb.loc +14 -0
    Updated test case for bug #29442.

  mysql-test/t/loaddata.test@1.15.1.11, 2007-07-06 03:43:10+05:00, gshchepa@gleb.loc +25 -0
    Updated test case for bug #29442.

  sql/sql_class.cc@1.223.1.50, 2007-07-06 03:43:02+05:00, gshchepa@gleb.loc +3 -1
    Fixed bug #29442.
    The select_export::send_data method has been modified to encode text
    representation of fields of all data types like string fields.

  sql/sql_class.h@1.230.1.109, 2007-07-06 03:42:56+05:00, gshchepa@gleb.loc +12 -0
    Fixed bug #29442.
    The NUMERIC_CHARS macro constant has been defined to enumerate
    all possible characters of a numeric value text representation.
    The select_export::is_unsafe_field_sep boolean flag has been added
    to apply the encoding algorithm to non-string values when it is
    necessary.

ChangeSet@1.2529.4.3, 2007-07-05 19:20:14+02:00, istruewing@chilla.local +4 -0
  Post-merge fixes.
  Fixed typos and comment styles in tests.

  mysql-test/r/rpl_partition.result@1.2.1.1, 2007-07-05 19:20:10+02:00, istruewing@chilla.local +0 -22
    Post-merge fixes.
    Removed warnings after fixing --disable_warnings command.

  mysql-test/t/rpl_partition.test@1.2.1.1, 2007-07-05 19:20:10+02:00, istruewing@chilla.local +2 -2
    Post-merge fixes.
    Fixed typo in --disable_warnings and --enable_warnings.

  mysql-test/t/ctype_uca.test@1.18, 2007-07-05 19:20:10+02:00, istruewing@chilla.local +1 -1
    Post-merge fixes.
    Fixed comment style.

  mysql-test/t/subselect.test@1.160, 2007-07-05 19:20:10+02:00, istruewing@chilla.local +1 -1
    Post-merge fixes.
    Fixed comment style.

ChangeSet@1.1810.3128.2, 2007-07-05 18:24:48+03:00, gkodinov@magare.gmz +3 -0
  Bug #29166: 
  AsText() needs to know the maximum number of
  characters a IEEE double precision value can
  occupy to make sure there's enough buffer space.
  The number was too small to hold all possible
  values and this caused buffer overruns.
  Fixed by correcting the calculation of the 
  maximum digits in a string representation of an
  IEEE double precision value as printed by 
  String::qs_append(double).

  mysql-test/r/gis.result@1.35.1.10, 2007-07-05 18:24:46+03:00, gkodinov@magare.gmz +3 -0
    Bug #29166: test case

  mysql-test/t/gis.test@1.29.1.9, 2007-07-05 18:24:47+03:00, gkodinov@magare.gmz +20 -0
    Bug #29166: test case

  sql/spatial.cc@1.27.2.5, 2007-07-05 18:24:47+03:00, gkodinov@magare.gmz +22 -1
    Bug #29166: correct calculation of the maximum digits in
    a string representation of a double

ChangeSet@1.2536, 2007-07-05 19:02:04+05:00, bar@mysql.com +1 -0
  Fixing wrong results

  mysql-test/r/binlog_row_ctype_cp932.result@1.7.1.2, 2007-07-05 19:02:03+05:00, bar@mysql.com +1 -2
    Fixing wrong results

ChangeSet@1.2535, 2007-07-05 17:25:26+05:00, bar@mysql.com +1 -0
  Additional fix for the previous patch.

  mysql-test/r/binlog_row_ctype_cp932.result@1.7.1.1, 2007-07-05 17:25:24+05:00, bar@mysql.com +17 -0
    Additional fix for the previous patch.

ChangeSet@1.1810.3131.1, 2007-07-05 12:51:51+01:00, jonathan@chorlton.adsl.perkin.org.uk +1 -0
  make_binary_distribution.sh:
    This script incorrectly generates the mysql_install_db file, causing the
    problems detailed in bug#28585.  The automake infrastructure correctly
    generates the script, so just copy it in place.

  scripts/make_binary_distribution.sh@1.101.9.1, 2007-07-05 12:50:14+01:00, jonathan@chorlton.adsl.perkin.org.uk +1 -4
    This script incorrectly generates the mysql_install_db file, causing the
    problems detailed in bug#28585.  The automake infrastructure correctly
    generates the script, so just copy it in place.

ChangeSet@1.1810.3130.1, 2007-07-05 15:34:12+05:00, ramil@mysql.com +5 -0
  Fix for bug #28808: log_queries_not_using_indexes variable dynamic change is ignored
  
  Problem: logging queries not using indexes we check a special flag which 
  is set only at the server startup and is not changing with a corresponding
  server variable together.
  
  Fix: check the variable value instead of the flag.
  

  mysql-test/r/show_check.result@1.75.1.10, 2007-07-05 15:34:10+05:00, ramil@mysql.com +30 -0
    Fix for bug #28808: log_queries_not_using_indexes variable dynamic change is ignored
      - test result.

  mysql-test/t/show_check.test@1.54.1.11, 2007-07-05 15:34:10+05:00, ramil@mysql.com +16 -0
    Fix for bug #28808: log_queries_not_using_indexes variable dynamic change is ignored
      - test case.

  sql/mysqld.cc@1.439.1.179, 2007-07-05 15:34:10+05:00, ramil@mysql.com +0 -2
    Fix for bug #28808: log_queries_not_using_indexes variable dynamic change is ignored
      - SPECIAL_LOG_QUERIES_NOT_USING_INDEXES is not used anymore.

  sql/sql_parse.cc@1.426.159.1, 2007-07-05 15:34:10+05:00, ramil@mysql.com +1 -1
    Fix for bug #28808: log_queries_not_using_indexes variable dynamic change is ignored
      - check opt_log_queries_not_using_indexes instead of 
        SPECIAL_LOG_QUERIES_NOT_USING_INDEXES flag.

  sql/unireg.h@1.39.1.10, 2007-07-05 15:34:11+05:00, ramil@mysql.com +1 -1
    Fix for bug #28808: log_queries_not_using_indexes variable dynamic change is ignored
      - SPECIAL_LOG_QUERIES_NOT_USING_INDEXES is not used anymore.

ChangeSet@1.2522.5.1, 2007-07-05 15:17:06+05:00, svoj@mysql.com +3 -0
  BUG#29464 - load data infile into table with big5 chinese fulltext index
              hangs 100% cpu
  
  Fulltext parser may fall into infinite loop when it gets illegal
  multibyte sequence (or a sequence that doesn't have mapping to unicode).
  
  Affects 5.1 only.

  mysql-test/r/fulltext.result@1.93, 2007-07-05 15:17:04+05:00, svoj@mysql.com +4 -0
    A test case for BUG#29464.

  mysql-test/t/fulltext.test@1.85, 2007-07-05 15:17:04+05:00, svoj@mysql.com +9 -0
    A test case for BUG#29464.

  storage/myisam/ft_parser.c@1.61, 2007-07-05 15:17:04+05:00, svoj@mysql.com +10 -6
    ctype() may return negative value, which was stored in unsigned
    variable.
    
    Also ctype() may return negative length for correct multibyte
    sequence that doesn't have a mapping to unicode. These characters
    are skipped correctly with this patch.

ChangeSet@1.2522.4.1, 2007-07-05 11:31:03+02:00, istruewing@chilla.local +2 -0
  Bug#26827 - table->read_set is set incorrectly,
              causing update of a different column
  
  Post-pushbuild fix.
  
  bitmap_set_bit() is an inline function in DEBUG builds and
  a macro in non-DEBUG builds. The latter evaluates its 'bit'
  argument twice. So one must not use increment/decrement operators
  on this argument.
  
  Moved increment of pointer out of bitmap_set_bit() call.

  include/my_bitmap.h@1.25, 2007-07-05 11:30:59+02:00, istruewing@chilla.local +11 -0
    Bug#26827 - table->read_set is set incorrectly,
                causing update of a different column
    Added a warning comment.

  sql/sql_partition.cc@1.109.2.2, 2007-07-05 11:30:59+02:00, istruewing@chilla.local +2 -2
    Bug#26827 - table->read_set is set incorrectly,
                causing update of a different column
    Moved increment of pointer out of bitmap_set_bit() call.

ChangeSet@1.1810.3126.3, 2007-07-05 13:09:56+05:00, ramil@mysql.com +3 -0
  Fix for bug #29420: crash with show and purge binlogs
  
  Problem: in case of failed 'show binlog events...' we don't inform that 
  the log is not in use anymore. That may confuse following 'purge logs...'
  command as it takes into account logs in use.
  
  Fix: always notify that the log is not in use anymore.

  mysql-test/r/rpl_rotate_logs.result@1.72.1.2, 2007-07-05 13:09:54+05:00, ramil@mysql.com +8 -0
    Fix for bug #29420: crash with show and purge binlogs
      - test result.

  mysql-test/t/rpl_rotate_logs.test@1.63.1.7, 2007-07-05 13:09:54+05:00, ramil@mysql.com +13 -1
    Fix for bug #29420: crash with show and purge binlogs
      - test case.

  sql/sql_repl.cc@1.133.1.29, 2007-07-05 13:09:54+05:00, ramil@mysql.com +2 -4
    Fix for bug #29420: crash with show and purge binlogs
      - always zero thd->current_linfo at the end of the mysql_show_binlog_events().

ChangeSet@1.2522.1.7, 2007-07-05 12:48:11+05:00, svoj@mysql.com +1 -0
  BUG#27564 - Valgrind: UDF does not cleanup correctly
  
  Enabling rpl_udf test.

  mysql-test/t/disabled.def@1.266.3.1, 2007-07-05 12:48:08+05:00, svoj@mysql.com +0 -1
    Enabling rpl_udf test.

ChangeSet@1.1810.3127.2, 2007-07-05 11:34:04+04:00, kostja@bodhi.(none) +8 -0
  A fix and a test case for Bug#29050 Creation of a legal stored procedure
  fails if a database is not selected prior.
  
  The problem manifested itself when a user tried to
  create a routine that had non-fully-qualified identifiers in its bodies
  and there was no current database selected.
  
  This is a regression introduced by the fix for Bug 19022:
  
  The patch for Bug 19022 changes the code to always produce a warning
  if we can't resolve the current database in the parser. 
  In this case this was not necessary, since even though the produced
  parsed tree was incorrect, we never re-use sphead
  that was obtained at first parsing of CREATE PROCEDURE.
  The sphead that is anyhow used is always obtained through db_load_routine,
  and there we change the current database to sphead->m_db before
  calling yyparse.
  
  The idea of the fix is to resolve the current database directly using 
  lex->sphead->m_db member when parsing a stored routine body, when
  such is present.
  
  This patch removes the need to reset the current database
  when loading a trigger or routine definition into SP cache.
  The redundant code will be removed in 5.1.

  mysql-test/r/sp.result@1.170.28.19, 2007-07-05 11:34:02+04:00, kostja@bodhi.(none) +18 -0
    Update test results (Bug#29050)

  mysql-test/r/trigger.result@1.29.11.15, 2007-07-05 11:34:02+04:00, kostja@bodhi.(none) +2 -2
    Update results.

  mysql-test/t/sp.test@1.174.41.2, 2007-07-05 11:34:02+04:00, kostja@bodhi.(none) +25 -0
    Add a test case for Bug#29050

  mysql-test/t/trigger.test@1.34.11.16, 2007-07-05 11:34:02+04:00, kostja@bodhi.(none) +2 -2
    Fix wrong behavior covered with tests.

  sql/sql_lex.cc@1.142.1.82, 2007-07-05 11:34:02+04:00, kostja@bodhi.(none) +37 -0
    Implement st_lex::copy_db_to().

  sql/sql_lex.h@1.175.1.73, 2007-07-05 11:34:02+04:00, kostja@bodhi.(none) +2 -0
    Declare st_lex::copy_db_to().

  sql/sql_parse.cc@1.426.1.203, 2007-07-05 11:34:03+04:00, kostja@bodhi.(none) +1 -1
    Use st_lex::copy_db_to() in add_table_to_list, rather than
    THD::copy_db_to(). The former will use the database of the sphead,
    if we're parsing a stored routine, not the default database in
    THD. The default database is needed to initialize tables->db
    when the database part was not explicitly specified in the identifier.

  sql/sql_yacc.yy@1.371.118.1, 2007-07-05 11:34:03+04:00, kostja@bodhi.(none) +6 -9
    Use st_lex::copy_db_to() in the parser, rather than
    THD::copy_db_to(). The former will use the database of the sphead,
    if we're parsing a stored routine, not the default database in
    THD.

ChangeSet@1.2529.2.5, 2007-07-05 11:55:06+05:00, ramil@mysql.com +3 -0
  Fix for bug #29411: deleting from a csv table leads to the table corruption
  
  Problem: we don't adjust share->rows_recorded and local_saved_data_file_length
  deleting rows from a CSV table, so following table check may fail.
  
  Fix: properly adjust those values.

  mysql-test/r/csv.result@1.18.1.4, 2007-07-05 11:55:04+05:00, ramil@mysql.com +16 -2
    Fix for bug #29411: deleting from a csv table leads to the table corruption
      - test result.

  mysql-test/t/csv.test@1.23.1.3, 2007-07-05 11:55:04+05:00, ramil@mysql.com +13 -0
    Fix for bug #29411: deleting from a csv table leads to the table corruption
      - test case.

  storage/csv/ha_tina.cc@1.77.1.4, 2007-07-05 11:55:04+05:00, ramil@mysql.com +23 -7
    Fix for bug #29411: deleting from a csv table leads to the table corruption
      - decrement share->rows_recorded in the ha_tina::delete_row().
      - set share->rows_recorded and local_saved_data_file_length to 0 in the 
        ha_tina::delete_all_rows().
      - adjust local_saved_data_file_length after cleaning up in the 
        ha_tina::rnd_end().

ChangeSet@1.1616.3076.1, 2007-07-05 11:45:14+05:00, svoj@mysql.com +1 -0
  BUG#27564 - Valgrind: UDF does not cleanup correctly
  
  Dropping an user defined function may cause server crash in
  case this function is still in use by another thread.
  
  The problem was that our hash implementation didn't update
  hash link list properly when hash_update() was called.

  mysys/hash.c@1.41.2.1, 2007-07-05 11:45:13+05:00, svoj@mysql.com +19 -0
    The following requirement wasn't met by hash_update() function
    causing corruption of hash links list:
    
    After a record was unlinked from the old chain during update, it
    holds random position. By the chance this position is equal to
    position for the first element in the new chain. That means
    updated record is the only record in the new chain.

ChangeSet@1.1810.2897.57, 2007-07-05 11:36:31+05:00, bar@mysql.com +2 -0
  Printing copyright into ctype-extra.c

  strings/conf_to_src.c@1.19.1.2, 2007-07-05 11:36:30+05:00, bar@mysql.com +23 -0
    Printing copyright into ctype-extra.c

  strings/ctype-extra.c@1.23.1.5, 2007-07-05 11:36:30+05:00, bar@mysql.com +2 -1
    Printing copyright into ctype-extra.c

ChangeSet@1.1810.3120.7, 2007-07-04 21:12:07-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #29392.
  This bug may manifest itself for select queries over a multi-table view
  that includes an ORDER BY clause in its definition. If the select list of 
  the query contains references to the same view column with different
  aliases the names of the columns in the result output will be nevertheless
  the same, coinciding with one of the alias.
  
  The bug happened because the method Item_ref::get_tmp_table_item that
  was inherited by the class Item_direct_view_ref ignored the fact that
  the name of the view column reference must be inherited by the fields
  of the temporary table that was created in order to get the result rows
  sorted.

  mysql-test/r/view.result@1.138.1.71, 2007-07-04 21:11:57-07:00, igor@olga.mysql.com +47 -0
    Added a test case for bug #29392.

  mysql-test/t/view.test@1.126.1.63, 2007-07-04 21:11:57-07:00, igor@olga.mysql.com +55 -0
    Added a test case for bug #29392.

  sql/item.h@1.183.36.1, 2007-07-04 21:11:57-07:00, igor@olga.mysql.com +6 -0
    Fixed bug #29392.
    This bug may manifest itself for select queries over a multi-table view
    that includes an ORDER BY clause in its definition. If the select list of 
    the query contains references to the same view column with different
    aliases the names of the columns in the result output will be nevertheless
    the same, coinciding with one of the alias.
    
    The bug happened because the method Item_ref::get_tmp_table_item that
    was inherited by the class Item_direct_view_ref ignored the fact that
    the name of the view column reference must be inherited by the fields
    of the temporary table that was created in order to get the result rows
    sorted.
    
    Fixed by providing a proper implementation of the get_tmp_table_item 
    method for the Item_direct_view_ref class.

ChangeSet@1.2529.2.4, 2007-07-05 01:05:47+02:00, tsmith@maint1.mysql.com +12 -0
  WL#3914: Additonal accessors required to compile InnoDB as a plugin storage engine
  
  Add more accessors to MySQL internals in mysql/plugin.h, for storage
  engine plugins.
  
  Add some accessors specific to the InnoDB storage engine, to allow
  InnoDB to be compiled as a plugin (without MYSQL_SERVER).  InnoDB
  has additional requirements, due to its foreign key support, etc.

  include/m_string.h@1.49, 2007-07-05 01:01:50+02:00, tsmith@maint1.mysql.com +6 -6
    Add structure tag to LEX_STRING definition, so that it can be referred
    to by forward declarations.  Allow struct st_mysql_lex_string to be
    defined here, or in mysql/plugin.h.

  include/my_global.h@1.174, 2007-07-05 01:01:50+02:00, tsmith@maint1.mysql.com +11 -0
    Define INNODB_COMPATIBILITY_HOOKS unconditionally; it brackets
    some definitions needed for the InnoDB storage engine plugin
    which do not belong in our general plugin interface.

  include/mysql/plugin.h@1.37, 2007-07-05 01:01:50+02:00, tsmith@maint1.mysql.com +123 -0
    Additional accessors for MySQL internals:
     
    - Full definition of MYSQL_LEX_STRING (identical to LEX_STRING from
      m_string.h)
    - Full definition of MYSQL_XID (binary compatible with XID from
      handler.h)
    - mysql_tmpfile(), creates a temporary file in mysqld's tmpdir
    - thd_killed(), to check killed state of connection
    - thd_alloc() and similar allocation functions
    - thd_get_xid(), to get XID of connection's transaction
    - mysql_query_cache_invalidate4, to invalidate a table's query cache entries

  sql/handler.h@1.266, 2007-07-05 01:01:50+02:00, tsmith@maint1.mysql.com +9 -1
    Use MYSQL_XIDDATASIZE definition from mysql/plugin.h, to avoid redundant
    definitions

  sql/log.cc@1.282.1.13, 2007-07-05 01:01:50+02:00, tsmith@maint1.mysql.com +23 -0
    Add definitions for two InnoDB compatibility hooks:
    - mysql_bin_log_file(), to get log filename
    - mysql_bin_log_file_pos, to get position in file
      
    These are defined only if INNODB_COMPATIBILITY_HOOKS is defined;
    they are needed by the InnoDB plugin, but aren't part of the general
    plugin interface.  They are declared in ha_innodb.h for InnoDB's
    use.

  sql/mysql_priv.h@1.523.3.2, 2007-07-05 01:01:50+02:00, tsmith@maint1.mysql.com +46 -8
    Expose some server internals when INNODB_COMPATIBILITY_HOOKS is
    defined, so that InnoDB can be built as a plugin when MYSQL_SERVER
    is not defined.
      
    Move make_lex_string inside THD class.

  sql/sql_cache.cc@1.113.1.1, 2007-07-05 01:01:50+02:00, tsmith@maint1.mysql.com +12 -0
    Add definiton of mysql_query_cache_invalidate4(), a part of the
    plugin API (mysql/plugin.h).

  sql/sql_class.cc@1.335.1.9, 2007-07-05 01:01:50+02:00, tsmith@maint1.mysql.com +128 -0
    Add definitions for several accessor functions which form part
    of the plugin API (mysql/plugin.h):
    - mysql_tmpfile()
    - thd_alloc() and friends
    - thd_make_lex_string()
    - thd_get_xid()
     
    Add definitons for accessor functions which InnoDB requires,
    but which are not part of the plugin interface:
    - thd_charset()
    - thd_query()
    - thd_slave_thread()
    - thd_non_transactional_update()
    - thd_binlog_format()
     
    Move definition of make_lex_string() from sql_show.cc into THD class

  sql/sql_class.h@1.379, 2007-07-05 01:01:51+02:00, tsmith@maint1.mysql.com +4 -7
    Remove LEX_STRING_make(), and move make_lex_string() from sql_show.cc inside THD
    class.

  sql/sql_parse.cc@1.688.1.1, 2007-07-05 01:01:51+02:00, tsmith@maint1.mysql.com +3 -3
    Use thd->make_lex_string() instead of thd->LEX_STRING_make()

  sql/sql_show.cc@1.416.1.1, 2007-07-05 01:01:51+02:00, tsmith@maint1.mysql.com +4 -18
    Move make_lex_string() inside THD class

  storage/innobase/handler/ha_innodb.cc@1.346, 2007-07-05 01:01:51+02:00, tsmith@maint1.mysql.com +18 -17
    Call thd_make_lex_string() instead of make_lex_string().

ChangeSet@1.1810.3127.1, 2007-07-05 02:20:32+04:00, kostja@bodhi.(none) +4 -0
  A fix and a teset case for Bug#28551 The warning 
  'No database selected' is reported when calling stored procedures
  
  Remove the offending warning introduced by the fix for Bug
  25082
  This minimal patch relies on the intrinsic knowledge of the fact that
  mysql_change_db is never called with 'force_switch' set to TRUE
  when such a warning may be needed:
   * every stored routine belongs to a database (unlike, e.g., a 
  user defined function, which does not), so if we're activating the
  database of a stored routine, it can never be NULL.
  Therefore, this branch is never called for activation.
   * if we're restoring the 'old' current database after routine
  execution is complete, we should not issue a warning, since it's OK to 
  call a routine without having previously selected the current database.
  
  TODO: 'force_switch' is an ambiguous flag, since we do not actually
  have to 'force' the switch in case of stored routines at all.
  When we activate the routine's database, we should perform
  all the checks as in case of 'use db', and so we already do (in this
  case 'force_switch' is unused).
  When we load a routine into cache, we should not use mysql_change_db
  at all, since there it's enough to call thd->reset_db(). We
  do it this way for triggers, but code for routines is different (wrongly). 
  
  TODO: bugs are lurking in replication, since it bypasses mysql_change_db
  and calls thd->[re_]set_db to set the current database.
  The latter does not change thd->db_charset, thd->sctx->db_access
  and thd->variables.collation_database (and this may have nasty side
  effects).
  
  These todo items are to be addressed in a separate patch, if at all.

  mysql-test/r/sp.result@1.170.28.18, 2007-07-05 02:20:30+04:00, kostja@bodhi.(none) +7 -0
    Update results (Bug#28551)

  mysql-test/t/sp.test@1.174.41.1, 2007-07-05 02:20:30+04:00, kostja@bodhi.(none) +12 -0
    Add a test case (Bug#28551)

  sql/sp.cc@1.82.1.51, 2007-07-05 02:20:30+04:00, kostja@bodhi.(none) +4 -8
    Remove an obsolete comment.
    Replace a check with an assert.

  sql/sql_db.cc@1.120.1.17, 2007-07-05 02:20:30+04:00, kostja@bodhi.(none) +4 -4
    Remove the offending warning introduced by the fix for Bug
    25082
    This minimal patch relies on the intrinsic knowledge of the fact that
    mysql_change_db is never called with 'force_switch' set to TRUE
    when such a warning may be needed.

ChangeSet@1.2529.2.2, 2007-07-04 23:41:15+02:00, tsmith@maint1.mysql.com +13 -0
  Many tests have been moved to suite/*.  Some tests have been removed.
  
  Update the disabled.def files to reflect actual contents of the t/* directories.
  
  Also, move a few more tests into suite/*.

  mysql-test/suite/ndb/t/disabled.def@1.2, 2007-07-04 23:39:23+02:00, tsmith@maint1.mysql.com +1 -0
    Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.

  mysql-test/suite/parts/r/rpl_partition.result@1.3, 2007-07-04 23:29:27+02:00, tsmith@maint1.mysql.com +0 -0
    Rename: mysql-test/r/rpl_partition.result -> mysql-test/suite/parts/r/rpl_partition.result

  mysql-test/suite/parts/t/disabled.def@1.5, 2007-07-04 23:39:23+02:00, tsmith@maint1.mysql.com +0 -1
    Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.

  mysql-test/suite/parts/t/rpl_partition.test@1.3, 2007-07-04 23:29:15+02:00, tsmith@maint1.mysql.com +0 -0
    Rename: mysql-test/t/rpl_partition.test -> mysql-test/suite/parts/t/rpl_partition.test

  mysql-test/suite/rpl/t/disabled.def@1.3, 2007-07-04 23:39:23+02:00, tsmith@maint1.mysql.com +1 -0
    Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result@1.2, 2007-07-04 23:30:47+02:00, tsmith@maint1.mysql.com +0 -0
    Rename: mysql-test/r/rpl_ndb_ctype_ucs2_def.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result@1.2, 2007-07-04 23:30:47+02:00, tsmith@maint1.mysql.com +0 -0
    Rename: mysql-test/r/rpl_ndb_mix_innodb.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result

  mysql-test/suite/rpl_ndb/t/disabled.def@1.2, 2007-07-04 23:39:24+02:00, tsmith@maint1.mysql.com +2 -1
    Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt@1.2, 2007-07-04 23:30:38+02:00, tsmith@maint1.mysql.com +0 -0
    Rename: mysql-test/t/rpl_ndb_ctype_ucs2_def-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test@1.3, 2007-07-04 23:30:38+02:00, tsmith@maint1.mysql.com +0 -0
    Rename: mysql-test/t/rpl_ndb_ctype_ucs2_def.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt@1.2, 2007-07-04 23:30:38+02:00, tsmith@maint1.mysql.com +0 -0
    Rename: mysql-test/t/rpl_ndb_mix_innodb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test@1.3, 2007-07-04 23:30:38+02:00, tsmith@maint1.mysql.com +0 -0
    Rename: mysql-test/t/rpl_ndb_mix_innodb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test

  mysql-test/t/disabled.def@1.270, 2007-07-04 23:39:24+02:00, tsmith@maint1.mysql.com +0 -6
    Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.

ChangeSet@1.1810.2126.70, 2007-07-04 22:39:55+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#29354 - fix bug in bug fix,
    dont assert if 2 LCP's are being run during a node recovery

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.56.1, 2007-07-04 22:39:53+02:00, jonas@perch.ndb.mysql.com +1 -1
    ndb - bug#29354 - fix bug in bug fix,
      dont assert if 2 LCP's are being run during a node recovery

ChangeSet@1.2522.1.5, 2007-07-04 21:55:26+02:00, istruewing@chilla.local +4 -0
  Bug#26827 - table->read_set is set incorrectly,
            causing update of a different column
  
  For efficiency some storage engines do not read a complete record
  for update, but only the columns required for selecting the rows.
  
  When updating a row of a partitioned table, modifying a column
  that is part of the partition or subpartition expression, then
  the row may need to move from one [sub]partition to another one.
  This is done by inserting the new row into the target
  [sub]partition and deleting the old row from the originating one.
  For the insert we need a complete record.
  
  If an above mentioned engine was used for a partitioned table, we
  did not have a complete record in update_row(). The implicitly
  executed write_row() got an incomplete record.
  
  This is solved by instructing the engine to read a complete record
  if one of the columns of the partition or subpartiton is to be
  updated.
  
  No testcase. This can be reproduced with Falcon only. The engines
  contained in standard 5.1 do always return complete records on
  update.

  sql/ha_partition.cc@1.92.1.6, 2007-07-04 21:55:21+02:00, istruewing@chilla.local +37 -32
    Bug#26827 - table->read_set is set incorrectly,
                causing update of a different column
    Setting partition field bits in read_set if a writing
    operation is going on. This replaces the old function
    include_partition_fields_in_used_fields().
    Setting all bits in read_set if write_set contains a column
    used in a partition or subpartition expression.
    Removed include_partition_fields_in_used_fields().
    

  sql/ha_partition.h@1.38, 2007-07-04 21:55:21+02:00, istruewing@chilla.local +0 -1
    Bug#26827 - table->read_set is set incorrectly,
                causing update of a different column
    Removed declaration of
    include_partition_fields_in_used_fields().

  sql/partition_info.h@1.24, 2007-07-04 21:55:21+02:00, istruewing@chilla.local +7 -0
    Bug#26827 - table->read_set is set incorrectly,
                causing update of a different column
    Added a bitmap to partition_info for a quick check of
    columns used in a partition or subpartition expression.

  sql/sql_partition.cc@1.109.2.1, 2007-07-04 21:55:21+02:00, istruewing@chilla.local +33 -2
    Bug#26827 - table->read_set is set incorrectly,
                causing update of a different column
    Initializing the new bitmap with all columns used in a
    partition or subpartition expression.

ChangeSet@1.2514.14.8, 2007-07-04 12:26:39-06:00, tsmith@sita.local +2 -0
  rpl_misc_functions.result, rpl_misc_functions.test:
    Remove indeterministic behavior from a test

  mysql-test/suite/rpl/r/rpl_misc_functions.result@1.10, 2007-07-04 12:26:17-06:00, tsmith@sita.local +9 -8
    Remove indeterministic behavior from a test

  mysql-test/suite/rpl/t/rpl_misc_functions.test@1.13, 2007-07-04 12:26:17-06:00, tsmith@sita.local +11 -10
    Remove indeterministic behavior from a test

ChangeSet@1.2482.8.53, 2007-07-04 20:16:42+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  backport compute hash

  storage/ndb/include/ndbapi/Ndb.hpp@1.67, 2007-07-04 20:16:39+02:00, tomas@whalegate.ndb.mysql.com +34 -0
    backport compute hash

  storage/ndb/src/ndbapi/Ndb.cpp@1.96, 2007-07-04 20:16:39+02:00, tomas@whalegate.ndb.mysql.com +176 -0
    backport compute hash

ChangeSet@1.1810.3120.6, 2007-07-04 17:11:56+04:00, sergefp@mysql.com +1 -0
  Backport from 5.2: Fix valgrind failure: Don't access item_func->arguments()
  if item_func->argument_count()==0

  sql/sql_show.cc@1.253.52.4, 2007-07-04 17:11:53+04:00, sergefp@mysql.com +2 -4
    Backport from 5.2: Fix valgrind failure: Don't access item_func->arguments()
    if item_func->argument_count()==0

ChangeSet@1.2529.1.6, 2007-07-04 17:06:23+05:00, bar@mysql.com +1 -0
  Enabling ctype_big5

  mysql-test/t/disabled.def@1.266.1.2, 2007-07-04 17:06:21+05:00, bar@mysql.com +0 -1
    Enabling ctype_big5

ChangeSet@1.1810.3125.1, 2007-07-04 16:17:40+05:00, bar@mysql.com +4 -0
  Bug#29333 myisam corruption with character set cp932 collate cp932_japanese_ci
    Problem: wrong comparison with trailing space.
    This problem was fixed for all other character sets under terms of
    bug 7788 ""Table is full" occurs during a multitable update".
    ctype-cp932.c was forgotten.
    Fix: applying the same fix for ctype-cp932.c.
    (see ctype-sjis.c as an example of a previously correctly fixed file)

  mysql-test/t/ctype_cp932.test@1.8.6.1, 2007-07-04 16:17:39+05:00, bar@mysql.com +22 -0
    Adding test

  mysql-test/r/ctype_cp932.result@1.6.6.1, 2007-07-04 16:17:39+05:00, bar@mysql.com +16 -0
    Adding test

  strings/ctype-cp932.c@1.11.1.6, 2007-07-04 16:17:39+05:00, bar@mysql.com +11 -3
    Applying the same fix which was done for all other
        character sets under terms of bug 7788.

  strings/ctype-utf8.c@1.97.1.10, 2007-07-04 16:17:39+05:00, bar@mysql.com +18 -11
    Fixing the same problem for utf8_general_cs,
    which was forgotten in bug 7788 as well.

ChangeSet@1.1810.3124.1, 2007-07-04 14:53:08+05:00, bar@mysql.com +1 -0
  Bug#29382 Collation 'utf8_test_ci' not found in tests
  Problem: "mysql-test-run ctype_ldml" failed in binary
  distributions because mysql-test/std_data/Index.xml
  was included into distribution.
  Fix: adding missing file.

  scripts/make_binary_distribution.sh@1.101.1.26, 2007-07-04 14:53:07+05:00, bar@mysql.com +1 -0
    Adding missing file into distribution

ChangeSet@1.1810.3123.1, 2007-07-04 14:21:29+05:00, bar@mysql.com +2 -0
  Bug#29484 ctype_big5 fails on 'double whopper' in mysql-5.1-new-rpl
  Problem: "mysqldump" doesn exists when running "mysql-test-run --embedded-server".
  Fix: changing test to use "SELECT INTO OUTFILE" instead of "mysqldump -T".

  mysql-test/r/ctype_big5.result@1.13, 2007-07-04 14:21:28+05:00, bar@mysql.com +4 -2
    Fixing tests to use "SELECT INTO OUTFILE" instead of "mysqldump -T"

  mysql-test/t/ctype_big5.test@1.13, 2007-07-04 14:21:28+05:00, bar@mysql.com +4 -3
    Fixing tests to use "SELECT INTO OUTFILE" instead of "mysqldump -T"

ChangeSet@1.2522.3.4, 2007-07-04 11:58:56+03:00, gkodinov@magare.gmz +2 -0
  merge 5.0-opt -> 5.1-opt

  mysql-test/include/mix1.inc@1.39, 2007-07-04 11:58:54+03:00, gkodinov@magare.gmz +1 -1
    merge 5.0-opt -> 5.1-opt

  mysql-test/r/innodb_mysql.result@1.41, 2007-07-04 11:58:54+03:00, gkodinov@magare.gmz +1 -1
    merge 5.0-opt -> 5.1-opt

ChangeSet@1.1810.2897.54, 2007-07-04 12:04:57+05:00, bar@mysql.com +6 -0
  Bug#29499 Converting 'del' from ascii to Unicode results in 'question mark'

  mysql-test/r/ctype_latin1.result@1.8.1.1, 2007-07-04 12:04:55+05:00, bar@mysql.com +4 -0
    Adding tests

  mysql-test/r/ctype_ucs.result@1.39.1.14, 2007-07-04 12:04:55+05:00, bar@mysql.com +10 -0
    Adding tests

  mysql-test/t/ctype_latin1.test@1.9.1.1, 2007-07-04 12:04:55+05:00, bar@mysql.com +7 -0
    Adding tests

  mysql-test/t/ctype_ucs.test@1.36.1.16, 2007-07-04 12:04:55+05:00, bar@mysql.com +10 -0
    Adding tests

  sql/share/charsets/ascii.xml@1.6, 2007-07-04 12:04:55+05:00, bar@mysql.com +1 -1
    Changing mapping of 0x7F from "unassigned" to U+007F.

  strings/ctype-extra.c@1.23.1.4, 2007-07-04 12:04:55+05:00, bar@mysql.com +2 -2
    Regenerating ctype-extra.c from new ascii.xml

ChangeSet@1.2514.14.7, 2007-07-03 19:51:32-06:00, tsmith@sita.local +2 -0
  rpl_misc_functions.result, rpl_misc_functions.test:
    work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup

  mysql-test/suite/rpl/r/rpl_misc_functions.result@1.9, 2007-07-03 19:51:17-06:00, tsmith@sita.local +1 -1
    work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup

  mysql-test/suite/rpl/t/rpl_misc_functions.test@1.12, 2007-07-03 19:51:17-06:00, tsmith@sita.local +1 -1
    work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup

ChangeSet@1.1810.3120.5, 2007-07-04 03:15:37+05:00, gshchepa@gleb.loc +2 -0
  loaddata.result, loaddata.test:
    Updated test case for bug #29294.

  mysql-test/r/loaddata.result@1.20.1.11, 2007-07-04 03:15:11+05:00, gshchepa@gleb.loc +2 -2
    Updated test case for bug #29294.

  mysql-test/t/loaddata.test@1.15.1.10, 2007-07-04 03:14:46+05:00, gshchepa@gleb.loc +7 -7
    Updated test case for bug #29294.

ChangeSet@1.1616.3075.1, 2007-07-03 21:45:20+05:00, gshchepa@gleb.loc +2 -0
  loaddata.result, loaddata.test:
    Test case update for bug #29294.

  mysql-test/r/loaddata.result@1.14.1.5, 2007-07-03 21:44:26+05:00, gshchepa@gleb.loc +1 -10
    Test case update for bug #29294.

  mysql-test/t/loaddata.test@1.7.1.5, 2007-07-03 21:38:21+05:00, gshchepa@gleb.loc +1 -2
    Test case update for bug #29294.

ChangeSet@1.1616.3074.2, 2007-07-03 21:05:17+05:00, gshchepa@gleb.loc +1 -0
  sql_class.cc:
    Windows compilation error fix.

  sql/sql_class.cc@1.105.44.2, 2007-07-03 21:04:24+05:00, gshchepa@gleb.loc +1 -1
    Windows compilation error fix.

ChangeSet@1.2403.18.77, 2007-07-03 17:22:57+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#28720
    fix also undo files

  sql/ha_ndbcluster.cc@1.397.7.14, 2007-07-03 17:22:55+02:00, jonas@perch.ndb.mysql.com +2 -0
    ndb - bug#28720
      fix also undo files

ChangeSet@1.2522.1.4, 2007-07-03 08:11:38-07:00, antony@ppcg5.local +4 -0
  move test for bug29299 into seperate file as it requires charset gbk
  fixes test breakage on sles10-ia64-a which omits charset.

  mysql-test/r/fulltext3.result@1.1, 2007-07-03 08:11:34-07:00, antony@ppcg5.local +13 -0
    move test for bug29299 into seperate file as it requires charset gbk

  mysql-test/r/fulltext3.result@1.0, 2007-07-03 08:11:34-07:00, antony@ppcg5.local +0 -0

  mysql-test/t/fulltext3.test@1.1, 2007-07-03 08:11:34-07:00, antony@ppcg5.local +24 -0
    move test for bug29299 into seperate file as it requires charset gbk

  mysql-test/t/fulltext3.test@1.0, 2007-07-03 08:11:34-07:00, antony@ppcg5.local +0 -0

  mysql-test/r/fulltext2.result@1.17, 2007-07-03 08:11:34-07:00, antony@ppcg5.local +0 -12
    move test for bug29299 into seperate file as it requires charset gbk

  mysql-test/t/fulltext2.test@1.17, 2007-07-03 08:11:34-07:00, antony@ppcg5.local +0 -12
    move test for bug29299 into seperate file as it requires charset gbk

ChangeSet@1.2403.18.76, 2007-07-03 16:56:35+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#28720 - "Disk data meta information is not visible in mysqld but exists in ndbd"
    continue on unknown result (no contact)

  sql/ha_ndbcluster.cc@1.397.7.13, 2007-07-03 16:56:32+02:00, jonas@perch.ndb.mysql.com +4 -0
    continue on unknown result (no contact)

ChangeSet@1.1616.3074.1, 2007-07-03 19:37:46+05:00, gshchepa@gleb.loc +5 -0
  Fixed bug #29294.
  The `SELECT 'r' INTO OUTFILE ... FIELDS ENCLOSED BY 'r' ' statement
  encoded the 'r' string to a 4 byte string of value x'725c7272'
  (sequence of 4 characters: r\rr).
  The LOAD DATA statement decoded this string to a 1 byte string of
  value x'0d' (ASCII Carriage Return character) instead of the original
  'r' character.
  The same error also happened with the FIELDS ENCLOSED BY clause
  followed by special characters: 'n', 't', 'r', 'b', '0', 'Z' and 'N'.
  
  NOTE 1: This is a result of the undocumented feature: the LOAD DATA INFILE
  recognises 2-byte input sequences like \n, \t, \r and \Z in addition
  to documented 2-byte sequences: \0 and \N. This feature should be
  documented (here backspace character is a default ESCAPED BY character,
  in the real-life example it may be any ESCAPED BY character).
  
  NOTE 2, changed behaviour:
  Now the `SELECT INTO OUTFILE' statement with the `FIELDS ENCLOSED BY'
  clause followed by one of: 'n', 't', 'r', 'b', '0', 'Z' or 'N' characters
  encodes this special character itself by doubling it ('r' --> 'rr'),
  not by prepending it with an escape character.

  mysql-test/r/loaddata.result@1.14.1.4, 2007-07-03 19:05:23+05:00, gshchepa@gleb.loc +64 -1
    Updated test case for bug #29294.

  mysql-test/t/loaddata.test@1.7.1.4, 2007-07-03 19:05:21+05:00, gshchepa@gleb.loc +37 -1
    Updated test case for bug #29294.

  sql/sql_class.cc@1.105.44.1, 2007-07-03 19:04:57+05:00, gshchepa@gleb.loc +4 -1
    Fixed bug #29294.
    The select_export::send_data method has been modified to
    encode special values of the field_sep field by
    doubling of those values instead of prepending them with a
    value of the escape_char field.
    Example: The SELECT 'r' INTO OUTFILE FIELDS ENCLOSED BY 'r'
    now produces the 'rr' output string instead of x'5c72'
    (i.e. instead of sequence of 2 bytes: \ and r).

  sql/sql_class.h@1.146.52.22, 2007-07-03 19:04:53+05:00, gshchepa@gleb.loc +9 -0
    Fixed bug #29294.
    The ESCAPE_CHARS macro constant is defined to enumerate
    symbolic names of espace-sequences like  '\n', '\t' etc.
    The select_export::is_ambiguous_field_sep field has been added
    to distinguish special values of the field_sep field from
    another values (see ESCAPE_CHARS).

  sql/sql_load.cc@1.46.3.44, 2007-07-03 19:05:06+05:00, gshchepa@gleb.loc +1 -0
    Fixed bug #29294.
    Added commentary for the READ_INFO::unescape method.

ChangeSet@1.2403.18.75, 2007-07-03 16:29:25+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#28642 - Tablespace returning incorrect usage status
    make free 64 bit (as it represents free bytes, not free extents as originally designed)

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.71.1.2, 2007-07-03 16:29:23+02:00, jonas@perch.ndb.mysql.com +1 -1
    make free 64 bit (as it represents free bytes, not free extents as originally designed)

ChangeSet@1.2514.14.6, 2007-07-03 17:17:58+05:00, ramil@mysql.com +8 -0
  Complementary fix for bug #29353: inserting a negative value to a csv table 
  leads to the table corruption
  
  New Field::store() method implemented to explicitly set thd->count_cuted_fields
  before value storing, instead of (incorrectly) setting it in the CSV storage engine.
  Thread row counter now properly incremented during check and repair in the CSV engine.

  include/mysql/plugin.h@1.36, 2007-07-03 17:17:45+05:00, ramil@mysql.com +2 -1
    Complementary fix for bug #29353: inserting a negative value to a csv table 
    leads to the table corruption
      - thd_inc_row_count() function prototype added, which allows a storage 
        engine to increment thread row counter.

  mysql-test/r/csv.result@1.18.1.3, 2007-07-03 17:17:45+05:00, ramil@mysql.com +1 -1
    Complementary fix for bug #29353: inserting a negative value to a csv table 
    leads to the table corruption
      - result adjusted.

  sql/field.cc@1.395.1.1, 2007-07-03 17:17:45+05:00, ramil@mysql.com +12 -0
    Complementary fix for bug #29353: inserting a negative value to a csv table 
    leads to the table corruption
      - Field::store(const char *to, uint length, CHARSET_INFO *cs,
                     enum_check_fields check_level)
        method introduced in order to explicitly set count_cuted_fields before 
        a ::store call, then reset it back after.

  sql/field.h@1.235.1.1, 2007-07-03 17:17:45+05:00, ramil@mysql.com +2 -0
    Complementary fix for bug #29353: inserting a negative value to a csv table 
    leads to the table corruption
      - Field::store(const char *to, uint length, CHARSET_INFO *cs,
                     enum_check_fields check_level)
        method introduced in order to explicitly set count_cuted_fields before 
        a ::store call, then reset it back after.

  sql/mysql_priv.h@1.523.2.1, 2007-07-03 17:17:45+05:00, ramil@mysql.com +7 -0
    Complementary fix for bug #29353: inserting a negative value to a csv table 
    leads to the table corruption
      - enum enum_check_fields moved from sql/sql_class.h to sql/mysql_priv.h
        as it's used now in the field.h

  sql/sql_class.cc@1.335.1.8, 2007-07-03 17:17:45+05:00, ramil@mysql.com +5 -0
    Complementary fix for bug #29353: inserting a negative value to a csv table 
    leads to the table corruption
      - implementation of the new thd_inc_row_count() function which increments
        thread row counter.

  sql/sql_class.h@1.372.2.1, 2007-07-03 17:17:45+05:00, ramil@mysql.com +0 -2
    Complementary fix for bug #29353: inserting a negative value to a csv table 
    leads to the table corruption
      - enum enum_check_fields moved from sql/sql_class.h to sql/mysql_priv.h
        as it's used now in the field.h

  storage/csv/ha_tina.cc@1.77.1.3, 2007-07-03 17:17:45+05:00, ramil@mysql.com +4 -7
    Complementary fix for bug #29353: inserting a negative value to a csv table 
    leads to the table corruption
      - removed #define MYSQL_SERVER 1 - "a storage engine should not need 
        internals of the server"
      - removed thd->count_cuted_fields= CHECK_FIELD_WARN as we are not allowed to 
        access internals of THD.
      - used new Field::store() method to explicitly set thd->count_cuted_fields to
        CHECK_FIELD_WARN
      - thd_inc_row_count() calls added to ha_tina::repair() and ha_tina::check()
        to get proper row count values.

ChangeSet@1.2482.8.49, 2007-07-03 14:12:27+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#25901
    handle undofile/logfile groups that were created while node was node

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.163, 2007-07-03 14:12:24+02:00, jonas@perch.ndb.mysql.com +13 -9
    Make sure that START_RECREQ is run on lgman/tsman even during initial node restart

  storage/ndb/src/kernel/blocks/lgman.cpp@1.30, 2007-07-03 14:12:24+02:00, jonas@perch.ndb.mysql.com +13 -4
    Set state to LG_STARTING during node/system restart

  storage/ndb/src/kernel/blocks/lgman.hpp@1.10, 2007-07-03 14:12:24+02:00, jonas@perch.ndb.mysql.com +2 -1
    add new state

ChangeSet@1.2522.1.3, 2007-07-03 03:56:03-07:00, antony@ppcg5.local +1 -0
  fix bad merge

  mysql-test/r/fulltext2.result@1.16, 2007-07-03 03:55:53-07:00, antony@ppcg5.local +8 -8
    fix bad merge

ChangeSet@1.1810.3122.1, 2007-07-03 10:36:37+03:00, gkodinov@magare.gmz +1 -0
  Bug #28983: 'reset master' in multiple threads and innodb tables 
  asserts debug binary
  
  We can't reliably check if the binary log is opened without 
  acquiring its mutex. 
  Fixed by removing this check.

  sql/log.cc@1.158.22.1, 2007-07-03 10:29:54+03:00, gkodinov@magare.gmz +5 -5
    Bug #28983: 
    can't reliably check if bin_log is open outside of its mutex

ChangeSet@1.1810.2126.69, 2007-07-03 08:39:42+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#29354 - Incorrect handling of replica REDO during SR (5.0)
    Not very clever fix for DIH incorrect REDO handling
    - Dont report GCP_SAVE_CONF until first LCP has been complete during NR

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.55.1, 2007-07-03 08:39:40+02:00, jonas@perch.ndb.mysql.com +23 -4
    Not very clever fix for DIH incorrect REDO handling
      - Dont report GCP_SAVE_CONF until first LCP has been complete during NR

ChangeSet@1.1810.3103.7, 2007-07-02 14:22:03-04:00, iggy@amd64.(none) +1 -0
  Bug#24924 shared-memory-base-name that is too long causes buffer overflow
  - Testcase fixup.

  mysql-test/t/windows_shm.test@1.2, 2007-07-02 14:22:02-04:00, iggy@amd64.(none) +1 -1
    Bug#24924 shared-memory-base-name that is too long causes buffer overflow
    - Pass user, port and host to mysqladmin.

ChangeSet@1.1810.3120.2, 2007-07-02 22:18:41+04:00, sergefp@mysql.com +2 -0
  Fix testcase to be platform-independent

  mysql-test/t/innodb_mysql.test@1.3.31.2, 2007-07-02 22:18:38+04:00, sergefp@mysql.com +3 -1
    Fix testcase to be platform-independent

  mysql-test/r/innodb_mysql.result@1.3.15.3, 2007-07-02 22:18:38+04:00, sergefp@mysql.com +3 -3
    Fix testcase to be platform-independent

ChangeSet@1.2522.3.2, 2007-07-02 20:11:54+02:00, mikael@dator6.(none) +2 -0
  removed test case no longer supported

  mysql-test/r/partition.result@1.68, 2007-07-02 20:11:52+02:00, mikael@dator6.(none) +0 -10
    removed test case no longer supported

  mysql-test/t/partition.test@1.62, 2007-07-02 20:11:52+02:00, mikael@dator6.(none) +1 -11
    removed test case no longer supported

ChangeSet@1.2529, 2007-07-02 19:33:00+02:00, lars@mysql.com +1 -0
  post-merge fix

  mysql-test/r/innodb.result@1.197, 2007-07-02 19:32:58+02:00, lars@mysql.com +4 -4
    post-merge fix

ChangeSet@1.2482.112.1, 2007-07-02 19:14:48+02:00, thek@adventure.(none) +10 -0
  Bug#21074 Large query_cache freezes mysql server sporadically under heavy load
  
  Invaldating a subset of a sufficiently large query cache can take a long time.
  During this time the server is efficiently frozen and no other operation can
  be executed. This patch addresses this problem by moving the locks which cause
  the freezing and also by temporarily disable the query cache while the 
  invalidation takes place.

  sql/ha_ndbcluster.cc@1.452.4.1, 2007-07-02 19:14:46+02:00, thek@adventure.(none) +7 -6
    - mysql_rm_table_part2 has a new parameter to indicate if OPEN_lock mutex 
      protection is needed.

  sql/lock.cc@1.108.2.1, 2007-07-02 19:14:46+02:00, thek@adventure.(none) +96 -0
    - Added function for acquiring table name exclusive locks.
    - Added function for asserting that table name lock is acquired.

  sql/mysql_priv.h@1.509.5.1, 2007-07-02 19:14:46+02:00, thek@adventure.(none) +7 -4
    - Added function for acquiring table name exclusive locks.
    - Added function for asserting that table name lock is acquired.
    - Added parameter to mysql_rm_table_part2 to indicate whether OPEN_lock mutex
      protection is needed or not.

  sql/sql_cache.cc@1.112.1.1, 2007-07-02 19:14:46+02:00, thek@adventure.(none) +444 -267
    - Changed flush_in_progress-flag into a state and added a function, 
      is_flushing() to reflect on this state. A new state was needed to indicate
      that a partial invalidation was in progress.
    - An unused parameter 'under_guard' was removed.
    - The Query_cache mutex structural_guard was pushed down into one
      invalidate_table function to avoid multiple entry points which makes
      maintainens more difficult.
    - Instead of keeping the structural_guard mutex during the entire invalidation
      we set the query cache status state to TABLE_FLUSH_IN_PROGRESS to
      temporarily disable the cache and avoid locking other threads needing the
      Query_cache resource.

  sql/sql_cache.h@1.39, 2007-07-02 19:14:46+02:00, thek@adventure.(none) +60 -14
    - Changed flush_in_progress-flag into a state and added a function, 
      is_flushing() to reflect on this state. A new state was needed to indicate
      that a partial invalidation was in progress.
    - An unused parameter 'under_guard' was removed.
    - The Query_cache mutex structural_guard was pushed down into one
      invalidate_table function to avoid multiple entry points which makes
      maintainens more difficult.
    - Instead of keeping the structural_guard mutex during the entire invalidation
      we set the query cache status state to TABLE_FLUSH_IN_PROGRESS to
      temporarily disable the cache and avoid locking other threads needing the
      the Query_cache resource.

  sql/sql_db.cc@1.153.1.1, 2007-07-02 19:14:46+02:00, thek@adventure.(none) +1 -1
    - mysql_rm_table_part2_with_lock is redundant and replaced
    with mysql_rm_table_part2.

  sql/sql_parse.cc@1.675.5.1, 2007-07-02 19:14:47+02:00, thek@adventure.(none) +1 -1
    - Function query_cache_invalidate3 isn't protect by a lock and we have a 
      race condition.
    - Moving this function into mysql_rename_tables and make sure it is protected
      by a exclusive table name lock.

  sql/sql_rename.cc@1.43.1.1, 2007-07-02 19:14:47+02:00, thek@adventure.(none) +12 -4
    - Function query_cache_invalidation3 isn't protect by a lock and we have a 
      race condition.
    - Moving this function into mysql_rename_tables and make sure it is protected
      by a exclusive table name lock.
    - Instead of using LOCK_open mutex, which excludes all other threads, the lock
      is changed into exclusive table name locks instead. This prevents us from
      locking the server if a query cache invalidation would take a long time to
      complete.

  sql/sql_table.cc@1.424.3.1, 2007-07-02 19:14:47+02:00, thek@adventure.(none) +24 -58
    - Instead of using LOCK_open mutex, which excludes all other threads, the lock
      is changed into exclusive table name locks instead. This prevents us from
      locking the server if a query cache invalidation would take a long time to
      complete.
    - Added new parameter to mysql_rm_table_part2 to control whether OPEN_lock mutex
      needs to be aquired or not. This is currently needed by the NDB implemenation.

  sql/sql_trigger.cc@1.94.2.1, 2007-07-02 19:14:47+02:00, thek@adventure.(none) +24 -16
    - Table_triggers don't need to be protexted by LOCK_open mutex. This 
      patch cancel this restriction.
    - Refactored comments to doxygen style.

ChangeSet@1.2403.18.73, 2007-07-02 13:59:17+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#29364 - port merge (5.0 -> 5.1)

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.131.2.5, 2007-07-02 13:58:58+02:00, jonas@perch.ndb.mysql.com +0 -6
    ndb - bug#29364 - port merge (5.0 -> 5.1)

ChangeSet@1.1810.2126.68, 2007-07-02 13:45:24+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#29364 - "SQL queries hang while data node in start phase 5"
    In TC init node status for already started nodes during node restart
    (not present in 5.1)

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.48.1, 2007-07-02 13:45:15+02:00, jonas@perch.ndb.mysql.com +7 -0
    on node restart, make sure to init all already started nodes to NF_STARTED

  ndb/test/ndbapi/testNodeRestart.cpp@1.13.30.1, 2007-07-02 13:45:15+02:00, jonas@perch.ndb.mysql.com +58 -5
    test prg

  ndb/test/run-test/daily-basic-tests.txt@1.27.48.1, 2007-07-02 13:45:15+02:00, jonas@perch.ndb.mysql.com +4 -0
    test prg

ChangeSet@1.2526, 2007-07-02 11:29:07+04:00, kostja@bodhi.(none) +1 -0
  A post-merge fix.

  mysql-test/r/show_check.result@1.113.1.3, 2007-07-02 11:27:54+04:00, kostja@bodhi.(none) +366 -15
    A post-merge fix (Bug#10491)

ChangeSet@1.2514.14.3, 2007-07-02 07:34:42+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  minor fixes to appease pushbuild.
  ---
  Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
  into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540

  mysql-test/extra/binlog_tests/binlog.test@1.29, 2007-07-02 07:34:38+02:00, tnurnberg@sin.intern.azundris.com +1 -0
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    make test portable so it will work on servers with
    funny names.

  mysql-test/suite/binlog/r/binlog_row_binlog.result@1.19, 2007-07-02 07:34:38+02:00, tnurnberg@sin.intern.azundris.com +802 -802
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    make test portable so it will work on servers with
    funny names.

  mysql-test/suite/binlog/r/binlog_stm_binlog.result@1.34, 2007-07-02 07:34:38+02:00, tnurnberg@sin.intern.azundris.com +2 -2
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    make test portable so it will work on servers with
    funny names.

ChangeSet@1.1810.3103.6, 2007-07-02 07:13:40+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  minor fixes to appease pushbuild.

  mysql-test/t/binlog.test@1.4.11.1, 2007-07-02 07:13:32+02:00, tnurnberg@sin.intern.azundris.com +1 -0
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    make test portable so it will work on servers with
    funny names.

  mysql-test/r/binlog.result@1.4.9.1, 2007-07-02 07:13:32+02:00, tnurnberg@sin.intern.azundris.com +2 -2
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    make test portable so it will work on servers with
    funny names.

  sql/log.cc@1.158.1.58, 2007-07-02 07:13:32+02:00, tnurnberg@sin.intern.azundris.com +2 -2
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    change type to uchar * so it's the same as in 5.1.

ChangeSet@1.1810.3120.1, 2007-07-01 15:33:28-07:00, igor@olga.mysql.com +5 -0
  Fixed bug #25798.
  This bug may manifest itself not only with the queries for which
  the index-merge access method is chosen. It also may display
  itself for queries with DISTINCT.
  
  The bug was in how the Unique::get method used the merge_buffers
  function. To compare elements in the the queue employed by
  merge_buffers() it must use the buffpek_compare function rather
  than the function for binary comparison. 

  mysql-test/t/innodb_mysql.test@1.3.31.1, 2007-07-01 15:33:22-07:00, igor@olga.mysql.com +54 -0
    Added a test case for bug #25798.

  mysql-test/r/innodb_mysql.result@1.3.15.2, 2007-07-01 15:33:21-07:00, igor@olga.mysql.com +51 -0
    Added a test case for bug #25798.

  sql/filesort.cc@1.105.1.17, 2007-07-01 15:33:22-07:00, igor@olga.mysql.com +14 -4
    Fixed bug #25798.
    The function merge_buffers() when called from the Uniques::get method
    must use function buffpek_compare to compare elements in the queue it
    employs. The pointer to buffpek_compare and the info for the function
    that compares sorted records are passed to merge_buffers through certain 
    designated fields of the SORTPARAM structure.

  sql/sql_sort.h@1.7, 2007-07-01 15:33:22-07:00, igor@olga.mysql.com +9 -0
    Fixed bug #25798.
    Added fields to the SORTPARAM structure to be used in the function 
    merge_buffers when called by the Uniques::get method. 

  sql/uniques.cc@1.28.1.1, 2007-07-01 15:33:22-07:00, igor@olga.mysql.com +6 -7
    Fixed bug 25798.
    The function merge_buffers() when called from the Uniques::get method
    must use function buffpek_compare to compare elements in the queue it
    employes.

ChangeSet@1.1810.3109.5, 2007-07-02 01:28:20+04:00, kostja@bodhi.(none) +1 -0
  Update a missed test result.

  mysql-test/r/ps_6bdb.result@1.27.18.2, 2007-07-02 01:28:07+04:00, kostja@bodhi.(none) +1 -1
    Update test results (character sets patch).

ChangeSet@1.2522, 2007-07-01 11:00:29-07:00, igor@olga.mysql.com +2 -0
  Corrected a test case.

  mysql-test/r/events_bugs.result@1.33.1.4, 2007-07-01 11:00:23-07:00, igor@olga.mysql.com +5 -3
    Corrected a test case.

  mysql-test/t/events_bugs.test@1.34, 2007-07-01 11:00:23-07:00, igor@olga.mysql.com +6 -4
    Corrected a test case.

ChangeSet@1.2514.12.5, 2007-07-01 11:56:01+02:00, istruewing@synthia.local +4 -0
  Post.merge fixes
  Fixed warnings
  Fixed error numbers

  mysql-test/extra/rpl_tests/rpl_loaddata.test@1.10, 2007-07-01 11:55:53+02:00, istruewing@synthia.local +2 -2
    Fixed warnings

  mysql-test/r/ndb_single_user.result@1.10.1.1, 2007-07-01 11:55:54+02:00, istruewing@synthia.local +5 -5
    Post-merge fixes
    Changed error numbers

  mysql-test/t/ndb_single_user.test@1.8.2.1, 2007-07-01 11:55:54+02:00, istruewing@synthia.local +1 -1
    Post-merge fixes
    Changed error numbers

  mysql-test/t/bigint.test@1.34, 2007-07-01 11:55:54+02:00, istruewing@synthia.local +1 -1
    Fixed warnings

ChangeSet@1.2521, 2007-07-01 01:59:05-07:00, igor@olga.mysql.com +2 -0
  Made test case platform independent.

  mysql-test/r/events_bugs.result@1.33.1.3, 2007-07-01 01:58:56-07:00, igor@olga.mysql.com +2 -0
    Made test case platform independent.

  mysql-test/t/events_bugs.test@1.33, 2007-07-01 01:58:56-07:00, igor@olga.mysql.com +4 -2
    Made test case platform independent.

ChangeSet@1.2520, 2007-06-30 22:50:14-07:00, igor@olga.mysql.com +5 -0
  Post-merge fix.

  mysql-test/r/create.result@1.144.1.2, 2007-06-30 22:50:03-07:00, igor@olga.mysql.com +638 -0
    Post-merge fix.

  mysql-test/r/subselect.result@1.195, 2007-06-30 22:50:03-07:00, igor@olga.mysql.com +33 -0
    Post-merge fix.

  mysql-test/r/type_enum.result@1.37, 2007-06-30 22:50:03-07:00, igor@olga.mysql.com +31 -8
    Post-merge fix.

  mysql-test/r/rpl_switch_stm_row_mixed.result@1.22.1.1, 2007-06-30 22:50:03-07:00, igor@olga.mysql.com +2 -2
    Post-merge fix.

  mysql-test/t/type_enum.test@1.22, 2007-06-30 22:50:03-07:00, igor@olga.mysql.com +27 -10
    Post-merge fix.

ChangeSet@1.2514.12.4, 2007-06-30 18:17:20+02:00, istruewing@synthia.local +3 -0
  Post-merge fixes.

  sql/ha_partition.cc@1.92.1.4, 2007-06-30 18:17:08+02:00, istruewing@synthia.local +9 -0
    Post-merge fixes.
    The new function HA_EXTRA_INSERT_WITH_UPDATE needs to be handled in
    ha_partition::extra().

  storage/federated/ha_federated.cc@1.103, 2007-06-30 18:17:08+02:00, istruewing@synthia.local +35 -21
    Post-merge fixes.
    Removed leftover characters.
    Added a missing brace.
    Fixed and improved parenthesis handling in ha_federated::append_stmt_insert().
    Moved code from HA_EXTRA_RESET to ha_federated::reset().

  storage/federated/ha_federated.h@1.49, 2007-06-30 18:17:08+02:00, istruewing@synthia.local +4 -3
    Post-merge fixes.
    Changed byte to uchar.
    Added declaration for ha_federated::reset().

ChangeSet@1.2482.8.46, 2007-06-30 12:34:29+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  disable with bug no

  mysql-test/t/disabled.def@1.253.5.2, 2007-06-30 12:34:24+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    disable with bug no

ChangeSet@1.2495.4.37, 2007-06-30 12:01:10+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  disabled test with bug number

  mysql-test/t/disabled.def@1.265.1.3, 2007-06-30 12:01:01+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    disabled test with bug number

ChangeSet@1.2482.8.45, 2007-06-30 11:42:41+02:00, tomas@whalegate.ndb.mysql.com +12 -0
  ndb test suite cleanup + making ndb_autodiscover3 less flaky

  mysql-test/lib/mtr_cases.pl@1.58.1.1, 2007-06-30 11:42:34+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    ndb test suite cleanup + making ndb_autodiscover3 less flaky

  mysql-test/t/ndb_alter_table.test@1.37.2.1, 2007-06-30 11:42:34+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    ndb test suite cleanup + making ndb_autodiscover3 less flaky

  mysql-test/t/ndb_alter_table2.test@1.3.2.1, 2007-06-30 11:42:34+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    ndb test suite cleanup + making ndb_autodiscover3 less flaky

  mysql-test/t/ndb_alter_table3.test@1.10.2.1, 2007-06-30 11:42:34+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    ndb test suite cleanup + making ndb_autodiscover3 less flaky

  mysql-test/t/ndb_autodiscover3.test@1.11.2.1, 2007-06-30 11:42:34+02:00, tomas@whalegate.ndb.mysql.com +25 -7
    ndb test suite cleanup + making ndb_autodiscover3 less flaky

  mysql-test/t/ndb_binlog_ddl_multi.test@1.15.1.1, 2007-06-30 11:42:34+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    ndb test suite cleanup + making ndb_autodiscover3 less flaky

  mysql-test/t/ndb_binlog_log_bin.test@1.2.2.1, 2007-06-30 11:42:34+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    ndb test suite cleanup + making ndb_autodiscover3 less flaky

  mysql-test/t/ndb_binlog_multi.test@1.8.2.1, 2007-06-30 11:42:34+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    ndb test suite cleanup + making ndb_autodiscover3 less flaky

  mysql-test/t/ndb_cache_multi.test@1.4.2.1, 2007-06-30 11:42:34+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    ndb test suite cleanup + making ndb_autodiscover3 less flaky

  mysql-test/t/ndb_cache_multi2.test@1.6.2.1, 2007-06-30 11:42:34+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    ndb test suite cleanup + making ndb_autodiscover3 less flaky

  mysql-test/t/ndb_single_user.test@1.7.2.1, 2007-06-30 11:42:34+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    ndb test suite cleanup + making ndb_autodiscover3 less flaky

  mysql-test/t/rpl_ndb_ctype_ucs2_def.test@1.2, 2007-06-30 11:42:34+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    ndb test suite cleanup + making ndb_autodiscover3 less flaky

ChangeSet@1.2482.8.44, 2007-06-30 18:02:54+10:00, stewart@flamingspork.com +3 -0
  [PATCH] Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset
  
  Test that we can start a MySQL Server with a default multibyte charset with
  NDB running. Test *really* basic functionality too.
  
  Index: ndb-work/mysql-test/r/rpl_ndb_ctype_ucs2_def.result
  ===================================================================

  mysql-test/r/rpl_ndb_ctype_ucs2_def.result@1.1, 2007-06-29 15:44:03+10:00, stewart@flamingspork.com +9 -0
    Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset

  mysql-test/r/rpl_ndb_ctype_ucs2_def.result@1.0, 2007-06-29 15:44:03+10:00, stewart@flamingspork.com +0 -0

  mysql-test/t/rpl_ndb_ctype_ucs2_def-master.opt@1.1, 2007-06-29 15:44:03+10:00, stewart@flamingspork.com +1 -0
    Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset

  mysql-test/t/rpl_ndb_ctype_ucs2_def-master.opt@1.0, 2007-06-29 15:44:03+10:00, stewart@flamingspork.com +0 -0

  mysql-test/t/rpl_ndb_ctype_ucs2_def.test@1.1, 2007-06-29 15:44:03+10:00, stewart@flamingspork.com +42 -0
    Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset

  mysql-test/t/rpl_ndb_ctype_ucs2_def.test@1.0, 2007-06-29 15:44:03+10:00, stewart@flamingspork.com +0 -0

ChangeSet@1.2482.8.43, 2007-06-30 18:02:38+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset
  
  NDB util thread calls mysql_parse internally with plain old c strings (7bit ascii) to create tables (e.g. mysql.ndb_schema). With mysqld default charset set to a multibyte one (e.g. ucs2) mysql_parse would try to interpret the 7bit string as UCS2 and promptly explode in a heap.
  
  Solution is to set the util thread to be using utf8 charset.
  
  Index: ndb-work/sql/ha_ndbcluster.cc
  ===================================================================

  sql/ha_ndbcluster.cc@1.457.1.2, 2007-06-29 15:43:56+10:00, stewart@flamingspork.com +8 -0
    BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset

ChangeSet@1.2514.13.1, 2007-06-30 03:32:33+02:00, tnurnberg@sin.intern.azundris.com +5 -0
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  previous correction didn't. make sure "tail" is fixed up
  when filling cache several times; rework formulae.
  ---
  Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
  into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540

  mysql-test/extra/binlog_tests/binlog.test@1.27, 2007-06-30 03:28:29+02:00, tnurnberg@sin.intern.azundris.com +30 -1
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    show that fix for absolute end_log_pos in binlog also
    works when cache is read several times and headers are
    split across that boundary
    
    show that end_log_pos in SHOW BINLOG EVENTS is correct even in transactions.
    show that SHOW MASTER STATUS returns correct values while in transactions
    (so that mysqldump --master-data will work correctly).
    also remove bdb dependency.

  mysql-test/r/binlog_row_binlog.result@1.15.1.1, 2007-06-30 03:28:29+02:00, tnurnberg@sin.intern.azundris.com +947 -0
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    show that fix for absolute end_log_pos in binlog also
    works when cache is read several times and headers are
    split across that boundary
    
    show that end_log_pos in SHOW BINLOG EVENTS is correct even in transactions.
    show that SHOW MASTER STATUS returns correct values while in transactions
    (so that mysqldump --master-data will work correctly).
    also remove bdb dependency.

  mysql-test/r/binlog_stm_binlog.result@1.29.1.1, 2007-06-30 03:28:29+02:00, tnurnberg@sin.intern.azundris.com +416 -0
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    show that fix for absolute end_log_pos in binlog also
    works when cache is read several times and headers are
    split across that boundary
    
    show that end_log_pos in SHOW BINLOG EVENTS is correct even in transactions.
    show that SHOW MASTER STATUS returns correct values while in transactions
    (so that mysqldump --master-data will work correctly).
    also remove bdb dependency.

  mysql-test/r/rpl_row_create_table.result@1.12.1.1, 2007-06-30 03:28:29+02:00, tnurnberg@sin.intern.azundris.com +14 -14
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    expect corrent end_log_pos in binlog

  sql/log.cc@1.282.1.10, 2007-06-30 03:28:29+02:00, tnurnberg@sin.intern.azundris.com +42 -39
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    previous correction didn't. make sure "tail" is fixed up
    when filling cache several times; rework formulae.

ChangeSet@1.1810.3119.1, 2007-06-30 02:30:42+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  previous correction didn't. make sure "tail" is fixed up
  when filling cache several times; rework formulae.

  mysql-test/t/binlog.test@1.4.10.1, 2007-06-30 02:30:18+02:00, tnurnberg@sin.intern.azundris.com +30 -1
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    show that fix for absolute end_log_pos in binlog also
    works when cache is read several times and headers are
    split across that boundary

  mysql-test/r/binlog.result@1.4.8.1, 2007-06-30 02:30:18+02:00, tnurnberg@sin.intern.azundris.com +416 -0
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    show that fix for absolute end_log_pos in binlog also
    works when cache is read several times and headers are
    split across that boundary

  sql/log.cc@1.158.1.57, 2007-06-30 02:30:18+02:00, tnurnberg@sin.intern.azundris.com +42 -39
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    previous correction didn't. make sure "tail" is fixed up
    when filling cache several times; rework formulae.

ChangeSet@1.1810.3118.1, 2007-06-29 15:14:08-07:00, antony@ppcg5.local +1 -0
  fix Visual Studio build - strictness of compiler could not cast
  pointer into a BOOL type.

  sql/ha_federated.cc@1.24.25.5, 2007-06-29 15:14:00-07:00, antony@ppcg5.local +1 -1
    fix Visual Studio build - strictness of compiler could not cast
    pointer into a BOOL type.

ChangeSet@1.1810.3117.1, 2007-06-30 02:09:50+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #29205.
  When a UNION statement forced conversion of an UTF8
  charset value to a binary charset value, the byte
  length of the result values was truncated to the
  CHAR_LENGTH of the original UTF8 value.

  mysql-test/r/ctype_utf8.result@1.85.1.21, 2007-06-30 02:08:56+05:00, gshchepa@gleb.loc +37 -0
    Updated test case for bug #29205.

  mysql-test/t/ctype_utf8.test@1.84.1.13, 2007-06-30 02:08:55+05:00, gshchepa@gleb.loc +25 -0
    Updated test case for bug #29205.

  sql/item.cc@1.113.1.162, 2007-06-30 02:07:41+05:00, gshchepa@gleb.loc +9 -3
    Fixed bug #29205.
    The calculation of data length was modified in
    the Item_type_holder::join_types method to take into
    account possible conversion of a multibyte charset
    value to a binary charset value, when each
    multibyte character is converted into a sequence
    of bytes (not to a single byte of binary charset).

ChangeSet@1.1810.3116.1, 2007-06-29 13:55:16-07:00, antony@ppcg5.local +2 -0
  add and amend comments for clarity

  include/my_base.h@1.70.1.15, 2007-06-29 13:55:13-07:00, antony@ppcg5.local +2 -3
    amend comment for clarity

  sql/ha_federated.cc@1.24.26.1, 2007-06-29 13:55:13-07:00, antony@ppcg5.local +4 -0
    add comment

ChangeSet@1.2514.7.6, 2007-06-29 13:52:43-06:00, malff@weblab.(none) +1 -0
  Bug#29451 (Broken makefile dependencies with libndb.la)
  
  In Automake,
  mysqld_LDADD = libndb.la
  only adds libndb to the link command for mysqld,
  but does not declare a dependency.
  
  Added libndb.la to mysqld_DEPENDENCIES
  
  This fix a build race condition that currently
  breaks make -J builds, and also enforce a re-link
  of mysqld when libndb.la changes.

  sql/Makefile.am@1.190, 2007-06-29 13:52:40-06:00, malff@weblab.(none) +1 -1
    Fixed missing dependency

ChangeSet@1.1810.3114.1, 2007-06-29 22:13:33+04:00, evgen@moonbone.local +3 -0
  Bug#29261: Sort order of the collation wasn't used when comparing trailing
  spaces.
  
  When the my_strnncollsp_simple function compares two strings and one is a prefix
  of another then this function compares characters in the rest of longer key
  with the space character to find whether the longer key is greater or less.
  But the sort order of the collation isn't used in this comparison. This may
  lead to a wrong comparison result, wrongly created index or wrong order of the
  result set of a query with the ORDER BY clause.
  
  Now the my_strnncollsp_simple function uses collation sort order to compare
  the characters in the rest of longer key with the space character.

  mysql-test/r/ctype_collate.result@1.31.1.1, 2007-06-29 22:11:00+04:00, evgen@moonbone.local +8 -0
    Added a test case for the bug#29261: Sort order of the collation wasn't used
    when comparing trailing spaces.

  mysql-test/t/ctype_collate.test@1.21, 2007-06-29 22:10:59+04:00, evgen@moonbone.local +11 -0
    Added a test case for the bug#29261: Sort order of the collation wasn't used
    when comparing trailing spaces.

  strings/ctype-simple.c@1.75.1.8, 2007-06-29 22:12:44+04:00, evgen@moonbone.local +1 -1
    Bug#29261: Sort order of the collation wasn't used when comparing trailing
    spaces.
    Now the my_strnncollsp_simple function uses collation sort order to compare
    the characters in the rest of longer key with the space character.

ChangeSet@1.2514.7.5, 2007-06-29 12:12:47-06:00, malff@weblab.(none) +1 -0
  Adjusted tests results

  mysql-test/r/ndb_sp.result@1.2.1.2, 2007-06-29 12:12:44-06:00, malff@weblab.(none) +1 -1
    Adjusted test results

ChangeSet@1.1810.3109.4, 2007-06-29 22:05:43+04:00, anozdrin@ibm. +2 -0
  Update result files.

  mysql-test/r/ps_6bdb.result@1.27.18.1, 2007-06-29 22:05:41+04:00, anozdrin@ibm. +1 -1
    Update result file.

  mysql-test/r/ps_7ndb.result@1.26.8.4, 2007-06-29 22:05:41+04:00, anozdrin@ibm. +1 -1
    Update result file.

ChangeSet@1.2495.26.10, 2007-06-29 21:09:00+04:00, skozlov@mysql.com +6 -0
  Bug#29363

  mysql-test/suite/rpl/include/rpl_mixed_ddl.inc@1.2, 2007-06-29 21:08:49+04:00, skozlov@mysql.com +1 -1
    removed Server version from SHOW BINLOG EVENTS

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.2, 2007-06-29 21:08:49+04:00, skozlov@mysql.com +2 -2
    removed Server version from SHOW BINLOG EVENTS

  mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result@1.3, 2007-06-29 21:08:49+04:00, skozlov@mysql.com +1 -1
    updated result file

  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result@1.4, 2007-06-29 21:08:49+04:00, skozlov@mysql.com +9 -3
    updated result file

  mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test@1.2, 2007-06-29 21:08:49+04:00, skozlov@mysql.com +2 -1
    skip test for row/statement

  mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test@1.2, 2007-06-29 21:08:49+04:00, skozlov@mysql.com +2 -1
    skip test for row/statement

ChangeSet@1.2514.11.1, 2007-06-29 21:48:22+05:00, ramil@mysql.com +1 -0
  Fix for bug #19328: Slave timeout with COM_REGISTER_SLAVE error causing stop
  
  Problem: "Under high load, the slave registering to the master can timeout 
  during the COM_REGISTER_SLAVE execution. This causes an error, which 
  prevents the slave from connecting at all."
  
  Fix: Do not abort immediately, but retry registering on master.

  sql/slave.cc@1.308.1.5, 2007-06-29 21:48:20+05:00, ramil@mysql.com +208 -100
    Fix for bug #19328: Slave timeout with COM_REGISTER_SLAVE error causing stop
      - retry connecting after a failed slave registration on master.
        Reconnecting has been factored out (see try_to_reconnect() and 
        check_io_slave_killed()) to get rid of similar code used during 
        registering on master/dump requesting/event reading.
        All messages have been moved to reconnect_messages[] array 
        for easy usage and maintenance.
      - now one can force slave to reconnect using 
        ./mtr --mysqld=--loose-debug=d,FORCE_SLAVE_TO_RECONNECT_{REG, DUMP, EVENT}

ChangeSet@1.2514.7.4, 2007-06-29 17:59:19+04:00, anozdrin@ibm. +1 -0
  Fix typo.

  sql/sql_lex.cc@1.250, 2007-06-29 17:59:17+04:00, anozdrin@ibm. +1 -1
    Fix typo.

ChangeSet@1.1810.3109.3, 2007-06-29 17:37:17+04:00, anozdrin@ibm. +6 -0
  Follow up to the patch for the BUG#10491.

  mysql-test/r/ps_1general.result@1.50.1.7, 2007-06-29 17:37:15+04:00, anozdrin@ibm. +2 -2
    Update result file.

  mysql-test/r/ps_2myisam.result@1.39.6.4, 2007-06-29 17:37:15+04:00, anozdrin@ibm. +1 -1
    Update result file.

  mysql-test/r/ps_3innodb.result@1.42.6.4, 2007-06-29 17:37:15+04:00, anozdrin@ibm. +1 -1
    Update result file.

  mysql-test/r/ps_4heap.result@1.38.6.4, 2007-06-29 17:37:15+04:00, anozdrin@ibm. +1 -1
    Update result file.

  mysql-test/r/ps_5merge.result@1.39.6.4, 2007-06-29 17:37:15+04:00, anozdrin@ibm. +2 -2
    Update result file.

  tests/mysql_client_test.c@1.167.1.67, 2007-06-29 17:37:15+04:00, anozdrin@ibm. +3 -1
    Fix test -- after field changing character set to utf8 in the server,
    length should be calculated differently.

ChangeSet@1.2514.7.3, 2007-06-29 16:52:05+04:00, anozdrin@ibm. +4 -0
  Folow up on the CS patch:
  1. Fix ddl_i18n_koi8r, ddl_i18n_utf8: explicitly specify character-sets
  directory for mysqldump;
  2. Fix crash in mysqldump if collation is not found;
  3. Use proper way to compare character set names.

  client/mysqldump.c@1.282.1.2, 2007-06-29 16:52:02+04:00, anozdrin@ibm. +45 -18
    Prevent crash if collation does not exist.

  mysql-test/t/ddl_i18n_koi8r.test@1.2, 2007-06-29 16:52:02+04:00, anozdrin@ibm. +13 -13
    Explicitly specify character-sets-directory for mysqldump.

  mysql-test/t/ddl_i18n_utf8.test@1.2, 2007-06-29 16:52:02+04:00, anozdrin@ibm. +13 -13
    Explicitly specify character-sets-directory for mysqldump.

  sql/sql_lex.cc@1.249, 2007-06-29 16:52:02+04:00, anozdrin@ibm. +1 -1
    Use my_charset_same() function to check if the charset names are equal.

ChangeSet@1.2514.3.13, 2007-06-29 14:43:54+02:00, msvensson@pilot.(none) +1 -0
  Update make_win_bin_dist to also copy mysql-test/suite directory

  scripts/make_win_bin_dist@1.21, 2007-06-29 14:43:52+02:00, msvensson@pilot.(none) +8 -2
    Copy all directories in mysql-test/suite/
    Allow no *.slave-mi to be found in mysql-test/t

ChangeSet@1.2514.3.12, 2007-06-29 14:18:20+02:00, msvensson@pilot.(none) +2 -0
  Reduce time for mysqladmin to try to shutdown servers from 70 to 20 seconds

  mysql-test/lib/mtr_process.pl@1.79, 2007-06-29 14:18:18+02:00, msvensson@pilot.(none) +1 -1
    Reduce time for mysqladmin to try to shutdown servers from 70 to 20 seconds

  mysql-test/mysql-test-run.pl@1.316, 2007-06-29 14:18:18+02:00, msvensson@pilot.(none) +2 -2
    Reduce time for mysqladmin to try to shutdown servers from 70 to 20 seconds

ChangeSet@1.1810.3110.2, 2007-06-29 10:26:20+02:00, msvensson@pilot.(none) +2 -0
  Bug#28356 Exec'ing "diff" from "mysqltest" loses the output, no information available
   - Use SQL for diffing master and slave

  mysql-test/r/rpl_misc_functions.result@1.4.1.2, 2007-06-29 10:26:19+02:00, msvensson@pilot.(none) +12 -4
    Dump t1 on slave and load it back into temporary table on master
    to allow comapre with SQL

  mysql-test/t/rpl_misc_functions.test@1.5.1.3, 2007-06-29 10:26:19+02:00, msvensson@pilot.(none) +26 -16
    Dump t1 on slave and load it back into temporary table on master
    to allow comapre with SQL

ChangeSet@1.1810.3107.2, 2007-06-29 10:39:17+03:00, gkodinov@magare.gmz +7 -0
  Bug#27333: subquery grouped for aggregate of outer 
  query / no aggregate of subquery
   The optimizer counts the aggregate functions that 
   appear as top level expressions (in all_fields) in 
   the current subquery. Later it makes a list of these
   that it uses to actually execute the aggregates in
   end_send_group().
   That count is used in several places as a flag whether
   there are aggregates functions.
   While collecting the above info it must not consider
   aggregates that are not aggregated in the current 
   context. It must treat them as normal expressions 
   instead. Not doing that leads to incorrect data about
   the query, e.g. running a query that actually has no
   aggregate functions as if it has some (and hence is
   expected to return only one row).
   Fixed by ignoring the aggregates that are not aggregated
   in the current context. 
   One other smaller omission discovered and fixed in the 
   process : the place of aggregation was not calculated for
   user defined functions. Fixed by calling 
   Item_sum::init_sum_func_check() and 
   Item_sum::check_sum_func() as it's done for the rest of 
   the aggregate functions.

  mysql-test/r/subselect.result@1.134.1.61, 2007-06-29 10:39:15+03:00, gkodinov@magare.gmz +33 -0
    Bug #27333: test case

  mysql-test/t/subselect.test@1.129.1.28, 2007-06-29 10:39:15+03:00, gkodinov@magare.gmz +42 -0
    Bug #27333: test case

  sql/item_subselect.cc@1.113.1.47, 2007-06-29 10:39:15+03:00, gkodinov@magare.gmz +2 -1
    Bug#27333: need select_lex to filter out
     aggregates that are not aggregated in
     the current select. 

  sql/item_sum.cc@1.170.27.1, 2007-06-29 10:39:15+03:00, gkodinov@magare.gmz +2 -2
    Bug#27333: need select_lex to filter out
     aggregates that are not aggregated in
     the current select. 

  sql/item_sum.h@1.102.1.11, 2007-06-29 10:39:15+03:00, gkodinov@magare.gmz +8 -1
    Bug#27333: calculate the place of 
     aggregation for user defined functions.

  sql/sql_select.cc@1.312.1.225, 2007-06-29 10:39:15+03:00, gkodinov@magare.gmz +30 -19
    Bug#27333: When counting the aggregated functions
     and collecting a list of them we must not consider
     the aggregates that are not aggregated in the local
     context as "local" : i.e. we must treat them as 
     normal functions and not add them to the aggregate
     functions list. 

  sql/sql_select.h@1.92.1.28, 2007-06-29 10:39:15+03:00, gkodinov@magare.gmz +2 -2
    Bug#27333: need select_lex to filter out
     aggregates that are not aggregated in
     the current select. 

ChangeSet@1.2514.3.10, 2007-06-29 09:28:51+02:00, msvensson@pilot.(none) +2 -0
  Bug#22540 Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
   - Update test results for --binlog-format=row

  mysql-test/suite/binlog/r/binlog_row_binlog.result@1.17, 2007-06-29 09:28:50+02:00, msvensson@pilot.(none) +131 -0
    Update test result

  mysql-test/suite/rpl/r/rpl_row_create_table.result@1.14, 2007-06-29 09:28:50+02:00, msvensson@pilot.(none) +14 -14
    Update test result

ChangeSet@1.2514.5.9, 2007-06-29 09:23:42+02:00, msvensson@pilot.(none) +1 -0
  WL3933
  - Don't fail if mysql-test/t/ doesn't have some files

  mysql-test/Makefile.am@1.111, 2007-06-29 09:23:41+02:00, msvensson@pilot.(none) +5 -5
    Don't fail if mysql-test/t/ doesn't have some files

ChangeSet@1.2514.5.8, 2007-06-29 09:00:52+02:00, msvensson@pilot.(none) +1 -0
  Cset exclude: msvensson@pilot.(none)|ChangeSet|20070628091815|48577

  mysql-test/Makefile.am@1.110, 2007-06-29 09:00:51+02:00, msvensson@pilot.(none) +0 -0
    Exclude

ChangeSet@1.1810.3111.3, 2007-06-28 16:03:01-07:00, antony@ppcg5.local +5 -0
  Bug#25513
    "Federared Transactions Failure"
    Bug occurs when the user performs an operation which inserts more than 
    one row into the federated table and the federated table references a 
    remote table stored within a transactional storage engine. When the
    insert operation for any one row in the statement fails due to 
    constraint violation, the federated engine is unable to perform 
    statement rollback and so the remote table contains a partial commit. 
    The user would expect a statement to perform the same so a statement 
    rollback is expected.
    This bug was fixed by implementing  bulk-insert handling into the
    federated storage engine. This will relieve the bug for most common
    situations by enabling the generation of a multi-row insert into the
    remote table and thus permitting the remote table to perform 
    statement rollback when neccessary.
    The multi-row insert is limited to the maximum packet size between 
    servers and should the size overflow, more than one insert statement 
    will be sent and this bug will reappear. Multi-row insert is disabled
    when an "INSERT...ON DUPLICATE KEY UPDATE" is being performed.
    The bulk-insert handling will offer a significant performance boost 
    when inserting a large number of small rows.
  This patch builds on Bug29019 and Bug25511

  mysql-test/r/federated_innodb.result@1.1, 2007-06-28 16:02:58-07:00, antony@ppcg5.local +34 -0
    New BitKeeper file ``mysql-test/r/federated_innodb.result''

  mysql-test/r/federated_innodb.result@1.0, 2007-06-28 16:02:58-07:00, antony@ppcg5.local +0 -0

  mysql-test/t/federated_innodb-slave.opt@1.1, 2007-06-28 16:02:58-07:00, antony@ppcg5.local +1 -0
    New BitKeeper file ``mysql-test/t/federated_innodb-slave.opt''

  mysql-test/t/federated_innodb-slave.opt@1.0, 2007-06-28 16:02:58-07:00, antony@ppcg5.local +0 -0

  mysql-test/t/federated_innodb.test@1.1, 2007-06-28 16:02:59-07:00, antony@ppcg5.local +34 -0
    New BitKeeper file ``mysql-test/t/federated_innodb.test''

  mysql-test/t/federated_innodb.test@1.0, 2007-06-28 16:02:59-07:00, antony@ppcg5.local +0 -0

  sql/ha_federated.cc@1.24.25.3, 2007-06-28 16:02:58-07:00, antony@ppcg5.local +202 -30
    bug25513
      new member methods:
        start_bulk_insert() - initializes memory for bulk insert
        end_bulk_insert() - sends any remaining bulk insert and frees memory
        append_stmt_insert() - create the INSERT statement

  sql/ha_federated.h@1.18.4.3, 2007-06-28 16:02:58-07:00, antony@ppcg5.local +12 -8
    bug25513
      new member value:
        bulk_insert
      new member methods:
        start_bulk_insert(), end_bulk_insert(), append_stmt_insert()
      make member methods private:
        read_next(), index_read_idx_with_result_set()

ChangeSet@1.1810.3111.2, 2007-06-28 13:36:26-07:00, antony@ppcg5.local +6 -0
  Bug#25511
    "Federated INSERT failures"
    Federated does not correctly handle "INSERT...ON DUPLICATE KEY UPDATE"
    However, implementing such support is not reasonably possible without
    increasing complexity of the storage engine: checking that constraints
    on remote server match local server and parsing error messages.
    This patch causes 'ON DUPLICATE KEY' to fail with ER_DUP_KEY message
    if a conflict occurs and not to fail silently.

  include/my_base.h@1.70.1.14, 2007-06-28 13:36:17-07:00, antony@ppcg5.local +7 -1
    bug25511
      new storage engine hint: HA_EXTRA_INSERT_WITH_UPDATE

  mysql-test/r/federated.result@1.25.1.17, 2007-06-28 13:36:17-07:00, antony@ppcg5.local +15 -0
    test for bug25511

  mysql-test/t/federated.test@1.19.1.18, 2007-06-28 13:36:17-07:00, antony@ppcg5.local +26 -0
    test for bug25511

  sql/sql_insert.cc@1.146.61.1, 2007-06-28 13:36:18-07:00, antony@ppcg5.local +8 -0
    bug25511
      implement support for HA_EXTRA_INSERT_WITH_UPDATE
      When checking duplicates flag, if it is DUP_UPDATE, send hint
      to the storage engine.

  sql/ha_federated.cc@1.24.25.2, 2007-06-28 13:36:18-07:00, antony@ppcg5.local +9 -1
    bug25511
      implement support for handling HA_EXTRA_INSERT_WITH_UPDATE hint

  sql/ha_federated.h@1.18.4.2, 2007-06-28 13:36:18-07:00, antony@ppcg5.local +1 -0
    bug25511
      new property: insert_dup_update

ChangeSet@1.2514.7.2, 2007-06-28 21:34:54+04:00, anozdrin@ibm. +82 -0
  Patch for the following bugs:
    - BUG#11986: Stored routines and triggers can fail if the code
      has a non-ascii symbol
    - BUG#16291: mysqldump corrupts string-constants with non-ascii-chars
    - BUG#19443: INFORMATION_SCHEMA does not support charsets properly
    - BUG#21249: Character set of SP-var can be ignored
    - BUG#25212: Character set of string constant is ignored (stored routines)
    - BUG#25221: Character set of string constant is ignored (triggers)
  
  There were a few general problems that caused these bugs:
  1. Character set information of the original (definition) query for views,
     triggers, stored routines and events was lost.
  2. mysqldump output query in client character set, which can be
     inappropriate to encode definition-query.
  3. INFORMATION_SCHEMA used strings with mixed encodings to display object
     definition;
  
  1. No query-definition-character set.
  
  In order to compile query into execution code, some extra data (such as
  environment variables or the database character set) is used. The problem
  here was that this context was not preserved. So, on the next load it can
  differ from the original one, thus the result will be different.
  
  The context contains the following data:
    - client character set;
    - connection collation (character set and collation);
    - collation of the owner database;
  
  The fix is to store this context and use it each time we parse (compile)
  and execute the object (stored routine, trigger, ...).
  
  2. Wrong mysqldump-output.
  
  The original query can contain several encodings (by means of character set
  introducers). The problem here was that we tried to convert original query
  to the mysqldump-client character set.
  
  Moreover, we stored queries in different character sets for different
  objects (views, for one, used UTF8, triggers used original character set).
  
  The solution is
    - to store definition queries in the original character set;
    - to change SHOW CREATE statement to output definition query in the
      binary character set (i.e. without any conversion);
    - introduce SHOW CREATE TRIGGER statement;
    - to dump special statements to switch the context to the original one
      before dumping and restore it afterwards.
  
  Note, in order to preserve the database collation at the creation time,
  additional ALTER DATABASE might be used (to temporary switch the database
  collation back to the original value). In this case, ALTER DATABASE
  privilege will be required. This is a backward-incompatible change.
  
  3. INFORMATION_SCHEMA showed non-UTF8 strings
  
  The fix is to generate UTF8-query during the parsing, store it in the object
  and show it in the INFORMATION_SCHEMA.
  
  Basically, the idea is to create a copy of the original query convert it to
  UTF8. Character set introducers are removed and all text literals are
  converted to UTF8.
  
  This UTF8 query is intended to provide user-readable output. It must not be
  used to recreate the object.  Specialized SHOW CREATE statements should be
  used for this.
  
  The reason for this limitation is the following: the original query can
  contain symbols from several character sets (by means of character set
  introducers).
  
  Example:
  
    - original query:
      CREATE VIEW v1 AS SELECT _cp1251 'Hello' AS c1;
  
    - UTF8 query (for INFORMATION_SCHEMA):
      CREATE VIEW v1 AS SELECT 'Hello' AS c1;

  client/mysqldump.c@1.282.1.1, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +382 -70
    Set original character set and collation before dumping definition query.

  include/my_sys.h@1.224, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +6 -6
    Move out-parameter to the end of list.

  mysql-test/include/ddl_i18n.check_events.inc@1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +48 -0
    Aux file for test suite.

  mysql-test/include/ddl_i18n.check_events.inc@1.0, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +0 -0

  mysql-test/include/ddl_i18n.check_sp.inc@1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +83 -0
    Aux file for test suite.

  mysql-test/include/ddl_i18n.check_sp.inc@1.0, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +0 -0

  mysql-test/include/ddl_i18n.check_triggers.inc@1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +106 -0
    Aux file for test suite.

  mysql-test/include/ddl_i18n.check_triggers.inc@1.0, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +0 -0

  mysql-test/include/ddl_i18n.check_views.inc@1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +32 -0
    Aux file for test suite.

  mysql-test/include/ddl_i18n.check_views.inc@1.0, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +0 -0

  mysql-test/include/have_cp1251.inc@1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +7 -0
    Aux file for test suite.

  mysql-test/include/have_cp1251.inc@1.0, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +0 -0

  mysql-test/include/have_cp866.inc@1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +7 -0
    Aux file for test suite.

  mysql-test/include/have_cp866.inc@1.0, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +0 -0

  mysql-test/include/have_koi8r.inc@1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +7 -0
    Aux file for test suite.

  mysql-test/include/have_koi8r.inc@1.0, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +0 -0

  mysql-test/include/have_utf8.inc@1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +7 -0
    Aux file for test suite.

  mysql-test/include/have_utf8.inc@1.0, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +0 -0

  mysql-test/lib/mtr_report.pl@1.52.2.1, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +6 -1
    Ignore server-warnings during the test case.

  mysql-test/r/create.result@1.145, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +2 -2
    Update result file.

  mysql-test/r/ctype_cp932_binlog_stm.result@1.10, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +3 -3
    Update result file.

  mysql-test/r/ddl_i18n_koi8r.result@1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +2783 -0
    Result file.

  mysql-test/r/ddl_i18n_koi8r.result@1.0, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +0 -0

  mysql-test/r/ddl_i18n_utf8.result@1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +2783 -0
    Result file.

  mysql-test/r/ddl_i18n_utf8.result@1.0, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +0 -0

  mysql-test/r/events.result@1.53, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +81 -58
    Update result file.

  mysql-test/r/events_bugs.result@1.33.2.1, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +38 -38
    Update result file.

  mysql-test/r/events_grant.result@1.6, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +12 -12
    Update result file.

  mysql-test/r/func_in.result@1.44, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +2 -2
    Update result file.

  mysql-test/r/gis.result@1.51, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +2 -2
    Update result file.

  mysql-test/r/grant.result@1.79, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +12 -12
    Update result file.

  mysql-test/r/have_cp1251.require@1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +2 -0
    Aux file for test suite.

  mysql-test/r/have_cp1251.require@1.0, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +0 -0

  mysql-test/r/have_cp866.require@1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +2 -0
    Aux file for test suite.

  mysql-test/r/have_cp866.require@1.0, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +0 -0

  mysql-test/r/have_koi8r.require@1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +2 -0
    Aux file for test suite.

  mysql-test/r/have_koi8r.require@1.0, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +0 -0

  mysql-test/r/have_utf8.require@1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +2 -0
    Aux file for test suite.

  mysql-test/r/have_utf8.require@1.0, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +0 -0

  mysql-test/r/information_schema.result@1.157, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +52 -48
    Update result file.

  mysql-test/r/information_schema_db.result@1.21, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +13 -13
    Update result file.

  mysql-test/r/lowercase_view.result@1.12, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +6 -6
    Update result file.

  mysql-test/r/mysqldump.result@1.152.1.1, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +336 -87
    Update result file.

  mysql-test/r/ps.result@1.117, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +42 -42
    Update result file.

  mysql-test/r/show_check.result@1.113.1.1, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +92 -20
    Update result file.

  mysql-test/r/skip_grants.result@1.12, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +6 -6
    Update result file.

  mysql-test/r/sp-destruct.result@1.6, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +13 -6
    Update result file.

  mysql-test/r/sp-error.result@1.127, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +6 -6
    Update result file.

  mysql-test/r/sp-security.result@1.39, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +18 -18
    Update result file.

  mysql-test/r/sp.result@1.278.1.1, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +77 -77
    Update result file.

  mysql-test/r/sql_mode.result@1.41, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +12 -12
    Update result file.

  mysql-test/r/system_mysql_db.result@1.49, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +8 -0
    Update result file.

  mysql-test/r/temp_table.result@1.27, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +2 -2
    Update result file.

  mysql-test/r/trigger-compat.result@1.7, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +3 -3
    Update result file.

  mysql-test/r/trigger-grant.result@1.13, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +9 -9
    Update result file.

  mysql-test/r/trigger.result@1.70, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +5 -5
    Update result file.

  mysql-test/r/view.result@1.236, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +84 -79
    Update result file.

  mysql-test/r/view_grant.result@1.36, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +38 -38
    Update result file.

  mysql-test/r/ndb_sp.result@1.2.1.1, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +2 -2
    Update result file.

  mysql-test/r/rpl_replicate_do.result@1.41.1.1, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +7 -7
    Update result file.

  mysql-test/r/rpl_sp.result@1.39.2.1, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +48 -24
    Update result file.

  mysql-test/r/rpl_trigger.result@1.11.1.1, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +3 -3
    Update result file.

  mysql-test/r/rpl_view.result@1.15.1.1, 2007-06-28 21:34:47+04:00, anozdrin@ibm. +2 -2
    Update result file.

  mysql-test/t/ddl_i18n_koi8r.test@1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +1112 -0
    Complete koi8r test case for the CS patch.

  mysql-test/t/ddl_i18n_koi8r.test@1.0, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +0 -0

  mysql-test/t/ddl_i18n_utf8.test@1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +1112 -0
    Complete utf8 test case for the CS patch.

  mysql-test/t/ddl_i18n_utf8.test@1.0, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +0 -0

  mysql-test/t/events.test@1.49, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +24 -1
    Update test case (new columns added).

  mysql-test/t/information_schema.test@1.100, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +1 -1
    Update test case (new columns added).

  mysql-test/t/show_check.test@1.79, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +51 -0
    Test case for SHOW CREATE TRIGGER in prepared statements and
    stored routines.

  mysql-test/t/sp-destruct.test@1.10, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +11 -4
    Update test case (new columns added).

  mysql-test/t/sp.test@1.244, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +1 -1
    Update test case (new columns added).

  mysql-test/t/view.test@1.205, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +9 -1
    Update test.

  mysys/charset.c@1.155, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +7 -7
    Move out-parameter to the end of list.

  scripts/mysql_system_tables.sql@1.11, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +2 -3
    Add new columns to mysql.proc and mysql.event.

  scripts/mysql_system_tables_fix.sql@1.64, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +46 -0
    Add new columns to mysql.proc and mysql.event.

  sql/event_data_objects.cc@1.105.1.1, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +137 -8
    Support new attributes for events.

  sql/event_data_objects.h@1.26, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +5 -2
    Support new attributes for events.

  sql/event_db_repository.cc@1.32, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +48 -0
    Support new attributes for events.

  sql/event_db_repository.h@1.17, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +5 -0
    Support new attributes for events.

  sql/events.cc@1.81, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +20 -1
    Add new columns to SHOW CREATE event resultset.

  sql/mysql_priv.h@1.523.1.1, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +95 -1
    1. Introduce Object_creation_ctx;
    2. Introduce SHOW CREATE TRIGGER;
    3. Introduce auxilary functions.

  sql/share/errmsg.txt@1.159.1.1, 2007-06-28 21:34:50+04:00, anozdrin@ibm. +21 -0
    Add new errors.

  sql/sp.cc@1.157.1.1, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +237 -17
    Add support for new store routines attributes.

  sql/sp_head.cc@1.278, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +72 -31
    Add support for new store routines attributes.

  sql/sp_head.h@1.111, 2007-06-28 21:34:48+04:00, anozdrin@ibm. +74 -4
    Add support for new store routines attributes.

  sql/sql_lex.cc@1.248, 2007-06-28 21:34:49+04:00, anozdrin@ibm. +197 -8
    Generate UTF8-body on parsing/lexing.

  sql/sql_lex.h@1.284, 2007-06-28 21:34:49+04:00, anozdrin@ibm. +63 -2
    1. Generate UTF8-body on parsing/lexing.
    2. Introduce SHOW CREATE TRIGGER.

  sql/sql_parse.cc@1.685, 2007-06-28 21:34:49+04:00, anozdrin@ibm. +40 -6
    Introduce SHOW CREATE TRIGGER.

  sql/sql_partition.cc@1.110, 2007-06-28 21:34:49+04:00, anozdrin@ibm. +1 -1
    Update parse_sql().

  sql/sql_prepare.cc@1.227, 2007-06-28 21:34:49+04:00, anozdrin@ibm. +2 -1
    Update parse_sql().

  sql/sql_show.cc@1.416, 2007-06-28 21:34:49+04:00, anozdrin@ibm. +413 -26
    Support new attributes for views

  sql/sql_trigger.cc@1.99, 2007-06-28 21:34:49+04:00, anozdrin@ibm. +387 -30
    Support new attributes for views

  sql/sql_trigger.h@1.32, 2007-06-28 21:34:49+04:00, anozdrin@ibm. +25 -2
    Support new attributes for views

  sql/sql_view.cc@1.143, 2007-06-28 21:34:49+04:00, anozdrin@ibm. +60 -20
    Support new attributes for views

  sql/sql_yacc.yy@1.583, 2007-06-28 21:34:49+04:00, anozdrin@ibm. +71 -29
    1. Add SHOW CREATE TRIGGER statement.
    2. Generate UTF8-body for views, stored routines, triggers and events.

  sql/table.cc@1.295, 2007-06-28 21:34:49+04:00, anozdrin@ibm. +122 -2
    Introduce Object_creation_ctx.

  sql/table.h@1.175, 2007-06-28 21:34:49+04:00, anozdrin@ibm. +50 -1
    Introduce Object_creation_ctx.

ChangeSet@1.2514.10.1, 2007-06-28 16:07:55+03:00, gkodinov@magare.gmz +7 -0
  Bug #29157: UPDATE, changed rows incorrect
  
  Sometimes the number of really updated rows (with changed
  column values) cannot be determined at the server level
  alone (e.g. if the storage engine does not return enough
  column values to verify that). So the only dependable way
  in such cases is to let the storage engine return that
  information if possible.
  Fixed the bug at server level by providing a way for the 
  storage engine to return information about wether it 
  actually updated the row or the old and the new column 
  values are the same. It can do that by returning 
  HA_ERR_RECORD_IS_THE_SAME in ha_update_row().
  Note that each storage engine may choose not to try to
  return this status code, so this behaviour remains 
  storage engine specific.

  include/my_base.h@1.101.1.1, 2007-06-28 16:07:53+03:00, gkodinov@magare.gmz +3 -1
    Bug #29157: handle the row not updated special return value

  sql/log_event.cc@1.290, 2007-06-28 16:07:53+03:00, gkodinov@magare.gmz +5 -1
    Bug #29157: handle the row not updated special return value

  sql/sp.cc@1.158, 2007-06-28 16:07:54+03:00, gkodinov@magare.gmz +4 -1
    Bug #29157: handle the row not updated special return value

  sql/sql_acl.cc@1.241, 2007-06-28 16:07:54+03:00, gkodinov@magare.gmz +32 -13
    Bug #29157: handle the row not updated special return value

  sql/sql_insert.cc@1.279, 2007-06-28 16:07:54+03:00, gkodinov@magare.gmz +12 -4
    Bug #29157: handle the row not updated special return value

  sql/sql_servers.cc@1.12, 2007-06-28 16:07:54+03:00, gkodinov@magare.gmz +5 -1
    Bug #29157: handle the row not updated special return value

  sql/sql_update.cc@1.249, 2007-06-28 16:07:54+03:00, gkodinov@magare.gmz +18 -5
    Bug #29157: handle the row not updated special return value

ChangeSet@1.1810.3109.2, 2007-06-28 13:24:52+04:00, anozdrin@ibm. +3 -0
  Fix for BUG#10491: Server returns data as charset binary
  SHOW CREATE TABLE or SELECT FROM I_S.
  
  Actually, the bug discovers two problems:
    - the original query is not preserved properly. This is the problem
      of BUG#16291;
    - the resultset of SHOW CREATE TABLE statement is binary.
  
  This patch fixes the second problem for the 5.0.
  
  Both problems will be fixed in 5.1.

  mysql-test/r/show_check.result@1.75.1.9, 2007-06-28 13:24:51+04:00, anozdrin@ibm. +443 -0
    Update result file.

  mysql-test/t/show_check.test@1.54.1.10, 2007-06-28 13:24:51+04:00, anozdrin@ibm. +248 -0
    Provide test case for BUG#10491.

  sql/item.h@1.183.1.51, 2007-06-28 13:24:51+04:00, anozdrin@ibm. +7 -1
    Use utf8_general_ci instead of binary collation by default,
    because for views and base tables utf8 is the character set
    in which their definition is stored. For system constants
    it's the default character set, and for other objects
    (routines, triggers), no character set is stored, and
    therefore no character set is known, so returning utf8
    is just as good as any non-binary character set.
    This latter problem is fixed in 5.1 by 16291. In 5.1
    we will return the "real" character set.

ChangeSet@1.1810.3101.3, 2007-06-28 11:23:59+02:00, msvensson@pilot.(none) +2 -0
  Bug#29361 mysqldump creates stray file when too long path name is passed
   - Move the check of too long path to 'get_one_option'

  client/mysqldump.c@1.214.1.53, 2007-06-28 11:23:58+02:00, msvensson@pilot.(none) +12 -11
    Move the check of too long path to 'get_one_option'

  mysql-test/r/mysqldump.result@1.83.1.43, 2007-06-28 11:23:58+02:00, msvensson@pilot.(none) +1 -1
    Update result file after changing error message

ChangeSet@1.1810.3112.1, 2007-06-28 11:13:18+02:00, msvensson@pilot.(none) +1 -0
  Bug#29414 HPUX build fails - 'noinst_HEADERS' does not exist

  sql/Makefile.am@1.103.1.33, 2007-06-28 11:13:16+02:00, msvensson@pilot.(none) +1 -2
    Avoid "noinst_HEADERS" being sucked into mysql_LDADD 
    target if @MYSQLD_EXTRA_IBS@ are empty

ChangeSet@1.2495.16.6, 2007-06-28 14:04:20+05:00, svoj@mysql.com +1 -0
  BUG#29207 - archive table reported as corrupt by check table
  After merge fix.

  mysql-test/r/archive.result@1.33, 2007-06-28 14:04:19+05:00, svoj@mysql.com +7 -0
    After merge fix.

ChangeSet@1.1810.3088.2, 2007-06-28 13:34:44+05:00, bar@mysql.com +5 -0
  Bug#27345 Incorrect data returned when range-read from utf8_danish_ci indexes
  Problem: like_range() returned wrong ranges for contractions (like 'ch' in Czech').
  Fix: adding a special code to handle tricky cases:
  - contraction head followed by a wild character
  - full contraction
  - contraction part followed by another contraction part,
    but they are not a contraction together.

  mysql-test/r/ctype_uca.result@1.19, 2007-06-28 13:34:42+05:00, bar@mysql.com +92 -0
    Adding test case

  mysql-test/t/ctype_uca.test@1.17, 2007-06-28 13:34:42+05:00, bar@mysql.com +54 -0
    Adding test case

  strings/ctype-mb.c@1.47.1.10, 2007-06-28 13:34:42+05:00, bar@mysql.com +70 -1
    Adding test case

  strings/ctype-uca.c@1.45.1.2, 2007-06-28 13:34:42+05:00, bar@mysql.com +10 -1
    Allocate additional 256 bytes for flags "is contraction part".

  strings/ctype-ucs2.c@1.50.1.17, 2007-06-28 13:34:43+05:00, bar@mysql.com +35 -0
    Adding test case

ChangeSet@1.2514.1.5, 2007-06-28 13:34:39+05:00, holyfoot@mysql.com +2 -0
  events_bugs.test didn't remove all the objects it created
  what caused some consequitive tests failures

  mysql-test/r/events_bugs.result@1.33.1.2, 2007-06-28 13:34:36+05:00, holyfoot@mysql.com +3 -1
    test result fixed

  mysql-test/t/events_bugs.test@1.32, 2007-06-28 13:34:36+05:00, holyfoot@mysql.com +2 -1
    typo fixed, event removed

ChangeSet@1.1810.3111.1, 2007-06-28 00:23:14-07:00, antony@ppcg5.local +4 -0
  Bug#29019
    "REPLACE/INSERT IGNORE/UPDATE IGNORE doesn't work"
    Federated does not record neccessary HA_EXTRA flags in order to
    support REPLACE/INSERT IGNORE/UPDATE IGNORE.
    Implement ::extra() to capture flags neccessary for functionality.
  New function append_ident() to better escape identifiers consistantly.

  mysql-test/r/federated.result@1.25.1.16, 2007-06-28 00:23:06-07:00, antony@ppcg5.local +24 -0
    test for bug29019

  mysql-test/t/federated.test@1.19.1.17, 2007-06-28 00:23:06-07:00, antony@ppcg5.local +27 -0
    test for bug29019

  sql/ha_federated.cc@1.24.25.1, 2007-06-28 00:23:07-07:00, antony@ppcg5.local +147 -64
    Bug29019
      Federated does not record neccessary HA_EXTRA flags in order to
      support REPLACE/INSERT IGNORE/UPDATE IGNORE.
      Implement ::extra() to capture flags neccessary for functionality.
    New function append_ident() to better escape identifiers consistantly.

  sql/ha_federated.h@1.18.4.1, 2007-06-28 00:23:07-07:00, antony@ppcg5.local +2 -0
    bug29019
      add 2 member values to ha_federated class
        ignore_duplicates and replace_duplicates.
      add 1 member method to ha_federated class
        extra()

ChangeSet@1.2495.26.8, 2007-06-28 07:06:25+02:00, tomas@poseidon.mysql.com +1 -0
  check for blackhole

  mysql-test/t/ndb_binlog_format.test@1.2, 2007-06-28 07:06:12+02:00, tomas@poseidon.mysql.com +1 -0
    check for blackhole

ChangeSet@1.2495.26.7, 2007-06-28 00:52:05+02:00, tomas@poseidon.mysql.com +1 -0
  correct comment as bug is fixed

  mysql-test/t/binlog_multi_engine.test@1.10, 2007-06-28 00:51:54+02:00, tomas@poseidon.mysql.com +0 -3
    correct comment as bug is fixed

ChangeSet@1.2495.26.6, 2007-06-28 00:49:54+02:00, tomas@poseidon.mysql.com +1 -0
  WL#3303
  - wrong results checked in

  mysql-test/r/binlog_multi_engine.result@1.8, 2007-06-28 00:49:43+02:00, tomas@poseidon.mysql.com +0 -2
    WL#3303
    - wrong results checked in

ChangeSet@1.2495.26.5, 2007-06-27 23:58:18+02:00, tomas@poseidon.mysql.com +1 -0
  Bug#29233 rpl_ndb_circular fails randomly
  - enabling test, duplicate bug, other bug fixed

  mysql-test/t/disabled.def@1.265.1.2, 2007-06-27 23:58:06+02:00, tomas@poseidon.mysql.com +0 -1
    Bug#29233 rpl_ndb_circular fails randomly
    - enabling test, duplicate bug, other bug fixed

ChangeSet@1.2495.26.4, 2007-06-27 22:33:03+02:00, tomas@poseidon.mysql.com +4 -0
  Bug #29222 Statement mode replicates both statement and rows when writing to an NDB table
  - only log statements locally (changes will not be logged on other servers)

  mysql-test/r/ndb_binlog_format.result@1.1, 2007-06-27 22:32:53+02:00, tomas@poseidon.mysql.com +30 -0
    New BitKeeper file ``mysql-test/r/ndb_binlog_format.result''

  mysql-test/r/ndb_binlog_format.result@1.0, 2007-06-27 22:32:53+02:00, tomas@poseidon.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new-rpl/mysql-test/r/ndb_binlog_format.result

  mysql-test/t/ndb_binlog_format.test@1.1, 2007-06-27 22:32:54+02:00, tomas@poseidon.mysql.com +32 -0
    New BitKeeper file ``mysql-test/t/ndb_binlog_format.test''

  mysql-test/t/ndb_binlog_format.test@1.0, 2007-06-27 22:32:54+02:00, tomas@poseidon.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new-rpl/mysql-test/t/ndb_binlog_format.test

  sql/ha_ndbcluster.cc@1.462, 2007-06-27 22:32:53+02:00, tomas@poseidon.mysql.com +22 -8
    Bug #29222 Statement mode replicates both statement and rows when writing to an NDB table
    - only log statements locally (changes will not be logged on other servers)

  sql/ha_ndbcluster.h@1.183, 2007-06-27 22:32:53+02:00, tomas@poseidon.mysql.com +1 -0
    Bug #29222 Statement mode replicates both statement and rows when writing to an NDB table
    - only log statements locally (changes will not be logged on other servers)

ChangeSet@1.2495.26.3, 2007-06-27 22:28:18+02:00, tomas@poseidon.mysql.com +1 -0
  WL#3303
  - binlog should always run if opt_bin_log is set

  sql/ha_ndbcluster_binlog.cc@1.119.1.4, 2007-06-27 22:28:07+02:00, tomas@poseidon.mysql.com +1 -9
    WL#3303
    - binlog should always run if opt_bin_log is set

ChangeSet@1.2495.26.2, 2007-06-27 22:23:44+02:00, tomas@poseidon.mysql.com +3 -0
  WL#3303
  - correct includes

  mysql-test/t/binlog_multi_engine.test@1.9, 2007-06-27 22:23:33+02:00, tomas@poseidon.mysql.com +1 -0
    WL#3303
    - correct includes

  mysql-test/t/rpl_ndb_commit_afterflush.test@1.7, 2007-06-27 22:23:33+02:00, tomas@poseidon.mysql.com +1 -0
    WL#3303
    - correct includes

  mysql-test/t/rpl_ndb_innodb_trans.test@1.5, 2007-06-27 22:23:33+02:00, tomas@poseidon.mysql.com +1 -0
    WL#3303
    - correct includes

ChangeSet@1.1810.3110.1, 2007-06-27 18:21:20+02:00, msvensson@pilot.(none) +2 -0
  Change "exec rm" to "remove_file"

  mysql-test/include/have_outfile.inc@1.5, 2007-06-27 18:21:19+02:00, msvensson@pilot.(none) +1 -1
    Change "exec rm" to "remove_file"

  mysql-test/t/sp.test@1.174.40.1, 2007-06-27 18:21:19+02:00, msvensson@pilot.(none) +8 -4
    Change "exec rm" to "remove_file"
    Change two "remove file if exists" to "check that file not exist"

ChangeSet@1.2514.6.2, 2007-06-27 16:49:32+02:00, msvensson@pilot.(none) +17 -0
  Move disabling of rpl_invoked_features to suite/rpl/t/disabled.def
  Move tests to their respective suite

  mysql-test/suite/binlog/r/binlog_innodb.result@1.5, 2007-06-27 14:35:36+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_innodb.result -> mysql-test/suite/binlog/r/binlog_innodb.result

  mysql-test/suite/binlog/r/binlog_multi_engine.result@1.5.1.1, 2007-06-27 14:39:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_multi_engine.result -> mysql-test/suite/binlog/r/binlog_multi_engine.result

  mysql-test/suite/binlog/t/binlog_innodb.test@1.4, 2007-06-27 14:35:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_innodb.test -> mysql-test/suite/binlog/t/binlog_innodb.test

  mysql-test/suite/binlog/t/binlog_multi_engine.test@1.5.1.1, 2007-06-27 14:39:12+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_multi_engine.test -> mysql-test/suite/binlog/t/binlog_multi_engine.test

  mysql-test/suite/rpl/r/rpl_grant.result@1.4, 2007-06-27 14:44:13+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_grant.result -> mysql-test/suite/rpl/r/rpl_grant.result

  mysql-test/suite/rpl/r/rpl_invoked_features.result@1.4, 2007-06-27 14:44:13+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_invoked_features.result -> mysql-test/suite/rpl/r/rpl_invoked_features.result

  mysql-test/suite/rpl/r/rpl_loaddata_fatal.result@1.5, 2007-06-27 14:44:13+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_loaddata_fatal.result -> mysql-test/suite/rpl/r/rpl_loaddata_fatal.result

  mysql-test/suite/rpl/r/rpl_slave_skip.result@1.4, 2007-06-27 14:44:13+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_slave_skip.result -> mysql-test/suite/rpl/r/rpl_slave_skip.result

  mysql-test/suite/rpl/t/disabled.def@1.2, 2007-06-27 16:49:31+02:00, msvensson@pilot.(none) +1 -0
    Move disabling of rpl_invoked_features to suite/rpl/t/disabled.def

  mysql-test/suite/rpl/t/rpl_grant.test@1.3, 2007-06-27 14:44:05+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_grant.test -> mysql-test/suite/rpl/t/rpl_grant.test

  mysql-test/suite/rpl/t/rpl_invoked_features-master.opt@1.2, 2007-06-27 14:44:05+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_invoked_features-master.opt -> mysql-test/suite/rpl/t/rpl_invoked_features-master.opt

  mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt@1.2, 2007-06-27 14:44:05+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_invoked_features-slave.opt -> mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt

  mysql-test/suite/rpl/t/rpl_invoked_features.test@1.5, 2007-06-27 14:44:05+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_invoked_features.test -> mysql-test/suite/rpl/t/rpl_invoked_features.test

  mysql-test/suite/rpl/t/rpl_loaddata_fatal-slave.opt@1.2, 2007-06-27 14:44:05+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_loaddata_fatal-slave.opt -> mysql-test/suite/rpl/t/rpl_loaddata_fatal-slave.opt

  mysql-test/suite/rpl/t/rpl_loaddata_fatal.test@1.3, 2007-06-27 14:44:05+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_loaddata_fatal.test -> mysql-test/suite/rpl/t/rpl_loaddata_fatal.test

  mysql-test/suite/rpl/t/rpl_slave_skip.test@1.3, 2007-06-27 14:44:05+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_slave_skip.test -> mysql-test/suite/rpl/t/rpl_slave_skip.test

  mysql-test/t/disabled.def@1.268, 2007-06-27 16:49:31+02:00, msvensson@pilot.(none) +0 -1
    Move disabling of rpl_invoked_features to suite/rpl/t/disabled.def

ChangeSet@1.1810.3108.1, 2007-06-27 18:10:19+05:00, svoj@mysql.com +3 -0
  BUG#29299 - repeatable myisam fulltext index corruption
  
  Fulltext index may get corrupt by certain gbk characters.
  
  The problem was that when skipping leading non-true-word-characters,
  we assumed that these characters are always 1 byte long. This is not
  the case with gbk character set, since non-true-word-characters may
  be 2 bytes long.
  
  Affects 5.0 only.

  mysql-test/r/fulltext2.result@1.13.1.1, 2007-06-27 18:10:18+05:00, svoj@mysql.com +12 -0
    A test case for BUG#29299.

  mysql-test/t/fulltext2.test@1.14.1.1, 2007-06-27 18:10:18+05:00, svoj@mysql.com +12 -0
    A test case for BUG#29299.

  myisam/ft_parser.c@1.46.5.1, 2007-06-27 18:10:18+05:00, svoj@mysql.com +4 -2
    Leading non-true-word-characters may also be multi-byte (e.g. in
    gbk character set).

ChangeSet@1.2499.1.1, 2007-06-27 14:28:02+02:00, msvensson@pilot.(none) +758 -0
  WL#3933 Split main test suite to rpl, rpl_ndb and ndb
   - Update mysql-test-run.pl to collect tests from several suites
   - Group test into suites
   - Add suite.opt file

  mysql-test/suite/binlog/r/binlog_row_blackhole.result@1.12.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_row_blackhole.result -> mysql-test/suite/binlog/r/binlog_row_blackhole.result

  mysql-test/suite/binlog/t/binlog_row_blackhole.test@1.2.1.1, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_row_blackhole.test -> mysql-test/suite/binlog/t/binlog_row_blackhole.test

  mysql-test/suite/ndb/r/ndb_binlog_basic2.result@1.1.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_binlog_basic2.result -> mysql-test/suite/ndb/r/ndb_binlog_basic2.result

  mysql-test/suite/ndb/t/ndb_binlog_basic2.test@1.3.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_binlog_basic2.test -> mysql-test/suite/ndb/t/ndb_binlog_basic2.test

  mysql-test/lib/mtr_cases.pl@1.62, 2007-06-27 14:27:58+02:00, msvensson@pilot.(none) +150 -91
    Reorganize collect function to collect from more than one suite
    Add new function collect_one_suite
    Set name of test to <suite>.<testname>

  mysql-test/lib/mtr_report.pl@1.50.4.1, 2007-06-27 14:27:58+02:00, msvensson@pilot.(none) +6 -21
    Determine name of files from "result_file" name

  mysql-test/mysql-test-run.pl@1.310.1.1, 2007-06-27 14:27:58+02:00, msvensson@pilot.(none) +18 -32
    Collect tests from suites main, binlog, rpl, rpl_ndb and ndb as default.
    Add --suites as a synonym of --suite and allow a semicolon separated
    list of suite names to be passed to it.
    Determine name of files to cleanup from "result_file" name
    Update usage
    Add possibility to add a suite.opt file

  mysql-test/suite/binlog/r/binlog_killed.result@1.7, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_killed.result -> mysql-test/suite/binlog/r/binlog_killed.result

  mysql-test/suite/binlog/r/binlog_row_binlog.result@1.16, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_row_binlog.result -> mysql-test/suite/binlog/r/binlog_row_binlog.result

  mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result@1.8, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_row_ctype_cp932.result -> mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result

  mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result@1.8, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_row_ctype_ucs.result -> mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result

  mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result@1.5, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_row_drop_tmp_tbl.result -> mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result

  mysql-test/suite/binlog/r/binlog_row_innodb_stat.result@1.2, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_row_innodb_stat.result -> mysql-test/suite/binlog/r/binlog_row_innodb_stat.result

  mysql-test/suite/binlog/r/binlog_row_insert_select.result@1.8, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_row_insert_select.result -> mysql-test/suite/binlog/r/binlog_row_insert_select.result

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.20.1.1, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_row_mix_innodb_myisam.result -> mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result

  mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result@1.6, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_statement_insert_delayed.result -> mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result

  mysql-test/suite/binlog/r/binlog_stm_binlog.result@1.27.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_stm_binlog.result -> mysql-test/suite/binlog/r/binlog_stm_binlog.result

  mysql-test/suite/binlog/r/binlog_stm_blackhole.result@1.21, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_stm_blackhole.result -> mysql-test/suite/binlog/r/binlog_stm_blackhole.result

  mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result@1.16, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_stm_ctype_cp932.result -> mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result

  mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result@1.16, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_stm_ctype_ucs.result -> mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result

  mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result@1.20, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_stm_drop_tmp_tbl.result -> mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result

  mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result@1.2, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_stm_innodb_stat.result -> mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result

  mysql-test/suite/binlog/r/binlog_stm_insert_select.result@1.10, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_stm_insert_select.result -> mysql-test/suite/binlog/r/binlog_stm_insert_select.result

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.42, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_stm_mix_innodb_myisam.result -> mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result

  mysql-test/suite/binlog/r/binlog_stm_ps.result@1.2, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/binlog_stm_ps.result -> mysql-test/suite/binlog/r/binlog_stm_ps.result

  mysql-test/suite/binlog/t/binlog_killed.test@1.11, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_killed.test -> mysql-test/suite/binlog/t/binlog_killed.test

  mysql-test/suite/binlog/t/binlog_row_binlog-master.opt@1.5, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_row_binlog-master.opt -> mysql-test/suite/binlog/t/binlog_row_binlog-master.opt

  mysql-test/suite/binlog/t/binlog_row_binlog.test@1.2, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_row_binlog.test -> mysql-test/suite/binlog/t/binlog_row_binlog.test

  mysql-test/suite/binlog/t/binlog_row_ctype_cp932.test@1.2, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_row_ctype_cp932.test -> mysql-test/suite/binlog/t/binlog_row_ctype_cp932.test

  mysql-test/suite/binlog/t/binlog_row_ctype_ucs.test@1.2, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_row_ctype_ucs.test -> mysql-test/suite/binlog/t/binlog_row_ctype_ucs.test

  mysql-test/suite/binlog/t/binlog_row_drop_tmp_tbl.test@1.2, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_row_drop_tmp_tbl.test -> mysql-test/suite/binlog/t/binlog_row_drop_tmp_tbl.test

  mysql-test/suite/binlog/t/binlog_row_innodb_stat-master.opt@1.2, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_row_innodb_stat-master.opt -> mysql-test/suite/binlog/t/binlog_row_innodb_stat-master.opt

  mysql-test/suite/binlog/t/binlog_row_innodb_stat.test@1.2, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_row_innodb_stat.test -> mysql-test/suite/binlog/t/binlog_row_innodb_stat.test

  mysql-test/suite/binlog/t/binlog_row_insert_select.test@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_row_insert_select.test -> mysql-test/suite/binlog/t/binlog_row_insert_select.test

  mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt@1.6, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_row_mix_innodb_myisam-master.opt -> mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt

  mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test@1.9.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_row_mix_innodb_myisam.test -> mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test

  mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test@1.3, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_statement_insert_delayed.test -> mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test

  mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt@1.2, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_stm_binlog-master.opt -> mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt

  mysql-test/suite/binlog/t/binlog_stm_binlog.test@1.7, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_stm_binlog.test -> mysql-test/suite/binlog/t/binlog_stm_binlog.test

  mysql-test/suite/binlog/t/binlog_stm_blackhole.test@1.4, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_stm_blackhole.test -> mysql-test/suite/binlog/t/binlog_stm_blackhole.test

  mysql-test/suite/binlog/t/binlog_stm_ctype_cp932.test@1.4, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_stm_ctype_cp932.test -> mysql-test/suite/binlog/t/binlog_stm_ctype_cp932.test

  mysql-test/suite/binlog/t/binlog_stm_ctype_ucs.test@1.3, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_stm_ctype_ucs.test -> mysql-test/suite/binlog/t/binlog_stm_ctype_ucs.test

  mysql-test/suite/binlog/t/binlog_stm_drop_tmp_tbl.test@1.3, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_stm_drop_tmp_tbl.test -> mysql-test/suite/binlog/t/binlog_stm_drop_tmp_tbl.test

  mysql-test/suite/binlog/t/binlog_stm_innodb_stat-master.opt@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_stm_innodb_stat-master.opt -> mysql-test/suite/binlog/t/binlog_stm_innodb_stat-master.opt

  mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test@1.3, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_stm_innodb_stat.test -> mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test

  mysql-test/suite/binlog/t/binlog_stm_insert_select.test@1.3, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_stm_insert_select.test -> mysql-test/suite/binlog/t/binlog_stm_insert_select.test

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt@1.7, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt -> mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@1.11, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_stm_mix_innodb_myisam.test -> mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test

  mysql-test/suite/binlog/t/binlog_stm_ps.test@1.3, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/binlog_stm_ps.test -> mysql-test/suite/binlog/t/binlog_stm_ps.test

  mysql-test/suite/funcs_1/t/suite.opt@1.1, 2007-06-27 14:27:58+02:00, msvensson@pilot.(none) +2 -0
    New BitKeeper file ``mysql-test/suite/funcs_1/t/suite.opt''

  mysql-test/suite/funcs_1/t/suite.opt@1.0, 2007-06-27 14:27:58+02:00, msvensson@pilot.(none) +0 -0

  mysql-test/suite/funcs_2/t/suite.opt@1.1, 2007-06-27 14:27:58+02:00, msvensson@pilot.(none) +2 -0
    New BitKeeper file ``mysql-test/suite/funcs_2/t/suite.opt''

  mysql-test/suite/funcs_2/t/suite.opt@1.0, 2007-06-27 14:27:58+02:00, msvensson@pilot.(none) +0 -0

  mysql-test/suite/ndb/r/loaddata_autocom_ndb.result@1.3, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/loaddata_autocom_ndb.result -> mysql-test/suite/ndb/r/loaddata_autocom_ndb.result

  mysql-test/suite/ndb/r/ndb_alter_table.result@1.42, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_alter_table.result -> mysql-test/suite/ndb/r/ndb_alter_table.result

  mysql-test/suite/ndb/r/ndb_alter_table2.result@1.4, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_alter_table2.result -> mysql-test/suite/ndb/r/ndb_alter_table2.result

  mysql-test/suite/ndb/r/ndb_alter_table3.result@1.8, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_alter_table3.result -> mysql-test/suite/ndb/r/ndb_alter_table3.result

  mysql-test/suite/ndb/r/ndb_autodiscover.result@1.33, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_autodiscover.result -> mysql-test/suite/ndb/r/ndb_autodiscover.result

  mysql-test/suite/ndb/r/ndb_autodiscover2.result@1.6, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_autodiscover2.result -> mysql-test/suite/ndb/r/ndb_autodiscover2.result

  mysql-test/suite/ndb/r/ndb_autodiscover3.result@1.6, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_autodiscover3.result -> mysql-test/suite/ndb/r/ndb_autodiscover3.result

  mysql-test/suite/ndb/r/ndb_backup_print.result@1.2.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_backup_print.result -> mysql-test/suite/ndb/r/ndb_backup_print.result

  mysql-test/suite/ndb/r/ndb_basic.result@1.58, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_basic.result -> mysql-test/suite/ndb/r/ndb_basic.result

  mysql-test/suite/ndb/r/ndb_binlog_basic.result@1.6, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_binlog_basic.result -> mysql-test/suite/ndb/r/ndb_binlog_basic.result

  mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result@1.19, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_binlog_ddl_multi.result -> mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result

  mysql-test/suite/ndb/r/ndb_binlog_discover.result@1.7, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_binlog_discover.result -> mysql-test/suite/ndb/r/ndb_binlog_discover.result

  mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result@1.7, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_binlog_ignore_db.result -> mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result

  mysql-test/suite/ndb/r/ndb_binlog_log_bin.result@1.2, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_binlog_log_bin.result -> mysql-test/suite/ndb/r/ndb_binlog_log_bin.result

  mysql-test/suite/ndb/r/ndb_binlog_multi.result@1.10, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_binlog_multi.result -> mysql-test/suite/ndb/r/ndb_binlog_multi.result

  mysql-test/suite/ndb/r/ndb_bitfield.result@1.17, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_bitfield.result -> mysql-test/suite/ndb/r/ndb_bitfield.result

  mysql-test/suite/ndb/r/ndb_blob.result@1.23, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_blob.result -> mysql-test/suite/ndb/r/ndb_blob.result

  mysql-test/suite/ndb/r/ndb_blob_partition.result@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_blob_partition.result -> mysql-test/suite/ndb/r/ndb_blob_partition.result

  mysql-test/suite/ndb/r/ndb_cache.result@1.5, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_cache.result -> mysql-test/suite/ndb/r/ndb_cache.result

  mysql-test/suite/ndb/r/ndb_cache2.result@1.5, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_cache2.result -> mysql-test/suite/ndb/r/ndb_cache2.result

  mysql-test/suite/ndb/r/ndb_cache_multi.result@1.3, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_cache_multi.result -> mysql-test/suite/ndb/r/ndb_cache_multi.result

  mysql-test/suite/ndb/r/ndb_cache_multi2.result@1.5, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_cache_multi2.result -> mysql-test/suite/ndb/r/ndb_cache_multi2.result

  mysql-test/suite/ndb/r/ndb_charset.result@1.15, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_charset.result -> mysql-test/suite/ndb/r/ndb_charset.result

  mysql-test/suite/ndb/r/ndb_condition_pushdown.result@1.33, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_condition_pushdown.result -> mysql-test/suite/ndb/r/ndb_condition_pushdown.result

  mysql-test/suite/ndb/r/ndb_config.result@1.11, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_config.result -> mysql-test/suite/ndb/r/ndb_config.result

  mysql-test/suite/ndb/r/ndb_config2.result@1.3, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_config2.result -> mysql-test/suite/ndb/r/ndb_config2.result

  mysql-test/suite/ndb/r/ndb_cursor.result@1.3, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_cursor.result -> mysql-test/suite/ndb/r/ndb_cursor.result

  mysql-test/suite/ndb/r/ndb_database.result@1.5, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_database.result -> mysql-test/suite/ndb/r/ndb_database.result

  mysql-test/suite/ndb/r/ndb_dd_alter.result@1.8, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_dd_alter.result -> mysql-test/suite/ndb/r/ndb_dd_alter.result

  mysql-test/suite/ndb/r/ndb_dd_backuprestore.result@1.13, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_dd_backuprestore.result -> mysql-test/suite/ndb/r/ndb_dd_backuprestore.result

  mysql-test/suite/ndb/r/ndb_dd_basic.result@1.17.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_dd_basic.result -> mysql-test/suite/ndb/r/ndb_dd_basic.result

  mysql-test/suite/ndb/r/ndb_dd_ddl.result@1.14.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_dd_ddl.result -> mysql-test/suite/ndb/r/ndb_dd_ddl.result

  mysql-test/suite/ndb/r/ndb_dd_disk2memory.result@1.10, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_dd_disk2memory.result -> mysql-test/suite/ndb/r/ndb_dd_disk2memory.result

  mysql-test/suite/ndb/r/ndb_dd_dump.result@1.6, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_dd_dump.result -> mysql-test/suite/ndb/r/ndb_dd_dump.result

  mysql-test/suite/ndb/r/ndb_dd_sql_features.result@1.5, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_dd_sql_features.result -> mysql-test/suite/ndb/r/ndb_dd_sql_features.result

  mysql-test/suite/ndb/r/ndb_gis.result@1.21.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_gis.result -> mysql-test/suite/ndb/r/ndb_gis.result

  mysql-test/suite/ndb/r/ndb_grant.result@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_grant.result -> mysql-test/suite/ndb/r/ndb_grant.result

  mysql-test/suite/ndb/r/ndb_index.result@1.4, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_index.result -> mysql-test/suite/ndb/r/ndb_index.result

  mysql-test/suite/ndb/r/ndb_index_ordered.result@1.30, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_index_ordered.result -> mysql-test/suite/ndb/r/ndb_index_ordered.result

  mysql-test/suite/ndb/r/ndb_index_unique.result@1.34, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_index_unique.result -> mysql-test/suite/ndb/r/ndb_index_unique.result

  mysql-test/suite/ndb/r/ndb_insert.result@1.15, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_insert.result -> mysql-test/suite/ndb/r/ndb_insert.result

  mysql-test/suite/ndb/r/ndb_limit.result@1.3, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_limit.result -> mysql-test/suite/ndb/r/ndb_limit.result

  mysql-test/suite/ndb/r/ndb_load.result@1.3, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_load.result -> mysql-test/suite/ndb/r/ndb_load.result

  mysql-test/suite/ndb/r/ndb_loaddatalocal.result@1.2, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_loaddatalocal.result -> mysql-test/suite/ndb/r/ndb_loaddatalocal.result

  mysql-test/suite/ndb/r/ndb_lock.result@1.20, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_lock.result -> mysql-test/suite/ndb/r/ndb_lock.result

  mysql-test/suite/ndb/r/ndb_minmax.result@1.2, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_minmax.result -> mysql-test/suite/ndb/r/ndb_minmax.result

  mysql-test/suite/ndb/r/ndb_multi.result@1.16, 2007-06-27 14:27:21+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_multi.result -> mysql-test/suite/ndb/r/ndb_multi.result

  mysql-test/suite/ndb/r/ndb_multi_row.result@1.5, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_multi_row.result -> mysql-test/suite/ndb/r/ndb_multi_row.result

  mysql-test/suite/ndb/r/ndb_partition_error.result@1.2, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_partition_error.result -> mysql-test/suite/ndb/r/ndb_partition_error.result

  mysql-test/suite/ndb/r/ndb_partition_error2.result@1.3, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_partition_error2.result -> mysql-test/suite/ndb/r/ndb_partition_error2.result

  mysql-test/suite/ndb/r/ndb_partition_key.result@1.8, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_partition_key.result -> mysql-test/suite/ndb/r/ndb_partition_key.result

  mysql-test/suite/ndb/r/ndb_partition_list.result@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_partition_list.result -> mysql-test/suite/ndb/r/ndb_partition_list.result

  mysql-test/suite/ndb/r/ndb_partition_range.result@1.6, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_partition_range.result -> mysql-test/suite/ndb/r/ndb_partition_range.result

  mysql-test/suite/ndb/r/ndb_read_multi_range.result@1.13.1.1, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_read_multi_range.result -> mysql-test/suite/ndb/r/ndb_read_multi_range.result

  mysql-test/suite/ndb/r/ndb_rename.result@1.2, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_rename.result -> mysql-test/suite/ndb/r/ndb_rename.result

  mysql-test/suite/ndb/r/ndb_replace.result@1.9, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_replace.result -> mysql-test/suite/ndb/r/ndb_replace.result

  mysql-test/suite/ndb/r/ndb_restore.result@1.27, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_restore.result -> mysql-test/suite/ndb/r/ndb_restore.result

  mysql-test/suite/ndb/r/ndb_restore_compat.result@1.6, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_restore_compat.result -> mysql-test/suite/ndb/r/ndb_restore_compat.result

  mysql-test/suite/ndb/r/ndb_restore_partition.result@1.2, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_restore_partition.result -> mysql-test/suite/ndb/r/ndb_restore_partition.result

  mysql-test/suite/ndb/r/ndb_restore_print.result@1.4, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_restore_print.result -> mysql-test/suite/ndb/r/ndb_restore_print.result

  mysql-test/suite/ndb/r/ndb_row_format.result@1.3.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_row_format.result -> mysql-test/suite/ndb/r/ndb_row_format.result

  mysql-test/suite/ndb/r/ndb_single_user.result@1.11, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_single_user.result -> mysql-test/suite/ndb/r/ndb_single_user.result

  mysql-test/suite/ndb/r/ndb_sp.result@1.3, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_sp.result -> mysql-test/suite/ndb/r/ndb_sp.result

  mysql-test/suite/ndb/r/ndb_subquery.result@1.8, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_subquery.result -> mysql-test/suite/ndb/r/ndb_subquery.result

  mysql-test/suite/ndb/r/ndb_temporary.result@1.3, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_temporary.result -> mysql-test/suite/ndb/r/ndb_temporary.result

  mysql-test/suite/ndb/r/ndb_transaction.result@1.5, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_transaction.result -> mysql-test/suite/ndb/r/ndb_transaction.result

  mysql-test/suite/ndb/r/ndb_trigger.result@1.4.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_trigger.result -> mysql-test/suite/ndb/r/ndb_trigger.result

  mysql-test/suite/ndb/r/ndb_truncate.result@1.3, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_truncate.result -> mysql-test/suite/ndb/r/ndb_truncate.result

  mysql-test/suite/ndb/r/ndb_types.result@1.6, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_types.result -> mysql-test/suite/ndb/r/ndb_types.result

  mysql-test/suite/ndb/r/ndb_update.result@1.21, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_update.result -> mysql-test/suite/ndb/r/ndb_update.result

  mysql-test/suite/ndb/r/ndb_view.result@1.2, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndb_view.result -> mysql-test/suite/ndb/r/ndb_view.result

  mysql-test/suite/ndb/r/ndbapi.result@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ndbapi.result -> mysql-test/suite/ndb/r/ndbapi.result

  mysql-test/suite/ndb/r/partition_03ndb.result@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/partition_03ndb.result -> mysql-test/suite/ndb/r/partition_03ndb.result

  mysql-test/suite/ndb/r/ps_7ndb.result@1.61, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ps_7ndb.result -> mysql-test/suite/ndb/r/ps_7ndb.result

  mysql-test/suite/ndb/r/strict_autoinc_5ndb.result@1.4, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/strict_autoinc_5ndb.result -> mysql-test/suite/ndb/r/strict_autoinc_5ndb.result

  mysql-test/suite/ndb/t/disabled.def@1.1, 2007-06-27 14:27:58+02:00, msvensson@pilot.(none) +23 -0
    New BitKeeper file ``mysql-test/suite/ndb/t/disabled.def''

  mysql-test/suite/ndb/t/disabled.def@1.0, 2007-06-27 14:27:58+02:00, msvensson@pilot.(none) +0 -0

  mysql-test/suite/ndb/t/loaddata_autocom_ndb.test@1.1.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/loaddata_autocom_ndb.test -> mysql-test/suite/ndb/t/loaddata_autocom_ndb.test

  mysql-test/suite/ndb/t/ndb_alter_table.test@1.37.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_alter_table.test -> mysql-test/suite/ndb/t/ndb_alter_table.test

  mysql-test/suite/ndb/t/ndb_alter_table2.test@1.3.1.1, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_alter_table2.test -> mysql-test/suite/ndb/t/ndb_alter_table2.test

  mysql-test/suite/ndb/t/ndb_alter_table3.test@1.10.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_alter_table3.test -> mysql-test/suite/ndb/t/ndb_alter_table3.test

  mysql-test/suite/ndb/t/ndb_autodiscover.test@1.25.1.1, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_autodiscover.test -> mysql-test/suite/ndb/t/ndb_autodiscover.test

  mysql-test/suite/ndb/t/ndb_autodiscover2-master.opt@1.2, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_autodiscover2-master.opt -> mysql-test/suite/ndb/t/ndb_autodiscover2-master.opt

  mysql-test/suite/ndb/t/ndb_autodiscover2.test@1.9.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_autodiscover2.test -> mysql-test/suite/ndb/t/ndb_autodiscover2.test

  mysql-test/suite/ndb/t/ndb_autodiscover3.test@1.11.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_autodiscover3.test -> mysql-test/suite/ndb/t/ndb_autodiscover3.test

  mysql-test/suite/ndb/t/ndb_backup_print.test@1.2.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_backup_print.test -> mysql-test/suite/ndb/t/ndb_backup_print.test

  mysql-test/suite/ndb/t/ndb_basic.test@1.59.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_basic.test -> mysql-test/suite/ndb/t/ndb_basic.test

  mysql-test/suite/ndb/t/ndb_binlog_basic.test@1.6, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_binlog_basic.test -> mysql-test/suite/ndb/t/ndb_binlog_basic.test

  mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test@1.16, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_binlog_ddl_multi.test -> mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test

  mysql-test/suite/ndb/t/ndb_binlog_discover.test@1.6, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_binlog_discover.test -> mysql-test/suite/ndb/t/ndb_binlog_discover.test

  mysql-test/suite/ndb/t/ndb_binlog_ignore_db-master.opt@1.2, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_binlog_ignore_db-master.opt -> mysql-test/suite/ndb/t/ndb_binlog_ignore_db-master.opt

  mysql-test/suite/ndb/t/ndb_binlog_ignore_db.test@1.6, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_binlog_ignore_db.test -> mysql-test/suite/ndb/t/ndb_binlog_ignore_db.test

  mysql-test/suite/ndb/t/ndb_binlog_log_bin.test@1.2.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_binlog_log_bin.test -> mysql-test/suite/ndb/t/ndb_binlog_log_bin.test

  mysql-test/suite/ndb/t/ndb_binlog_multi.test@1.8.1.1, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_binlog_multi.test -> mysql-test/suite/ndb/t/ndb_binlog_multi.test

  mysql-test/suite/ndb/t/ndb_bitfield.test@1.6.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_bitfield.test -> mysql-test/suite/ndb/t/ndb_bitfield.test

  mysql-test/suite/ndb/t/ndb_blob.test@1.20.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_blob.test -> mysql-test/suite/ndb/t/ndb_blob.test

  mysql-test/suite/ndb/t/ndb_blob_partition.test@1.3.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_blob_partition.test -> mysql-test/suite/ndb/t/ndb_blob_partition.test

  mysql-test/suite/ndb/t/ndb_cache.test@1.6.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_cache.test -> mysql-test/suite/ndb/t/ndb_cache.test

  mysql-test/suite/ndb/t/ndb_cache2.test@1.5.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_cache2.test -> mysql-test/suite/ndb/t/ndb_cache2.test

  mysql-test/suite/ndb/t/ndb_cache_multi.test@1.4.1.1, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_cache_multi.test -> mysql-test/suite/ndb/t/ndb_cache_multi.test

  mysql-test/suite/ndb/t/ndb_cache_multi2.test@1.6.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_cache_multi2.test -> mysql-test/suite/ndb/t/ndb_cache_multi2.test

  mysql-test/suite/ndb/t/ndb_charset.test@1.14.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_charset.test -> mysql-test/suite/ndb/t/ndb_charset.test

  mysql-test/suite/ndb/t/ndb_condition_pushdown.test@1.23.1.1, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_condition_pushdown.test -> mysql-test/suite/ndb/t/ndb_condition_pushdown.test

  mysql-test/suite/ndb/t/ndb_config.test@1.14.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_config.test -> mysql-test/suite/ndb/t/ndb_config.test

  mysql-test/suite/ndb/t/ndb_config2.test@1.1.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_config2.test -> mysql-test/suite/ndb/t/ndb_config2.test

  mysql-test/suite/ndb/t/ndb_cursor.test@1.2.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_cursor.test -> mysql-test/suite/ndb/t/ndb_cursor.test

  mysql-test/suite/ndb/t/ndb_database.test@1.3.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_database.test -> mysql-test/suite/ndb/t/ndb_database.test

  mysql-test/suite/ndb/t/ndb_dd_alter.test@1.5.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_dd_alter.test -> mysql-test/suite/ndb/t/ndb_dd_alter.test

  mysql-test/suite/ndb/t/ndb_dd_backuprestore.test@1.8.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_dd_backuprestore.test -> mysql-test/suite/ndb/t/ndb_dd_backuprestore.test

  mysql-test/suite/ndb/t/ndb_dd_basic.test@1.12.1.1, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_dd_basic.test -> mysql-test/suite/ndb/t/ndb_dd_basic.test

  mysql-test/suite/ndb/t/ndb_dd_ddl.test@1.12.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_dd_ddl.test -> mysql-test/suite/ndb/t/ndb_dd_ddl.test

  mysql-test/suite/ndb/t/ndb_dd_disk2memory.test@1.4.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_dd_disk2memory.test -> mysql-test/suite/ndb/t/ndb_dd_disk2memory.test

  mysql-test/suite/ndb/t/ndb_dd_dump.test@1.5.1.1, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_dd_dump.test -> mysql-test/suite/ndb/t/ndb_dd_dump.test

  mysql-test/suite/ndb/t/ndb_dd_sql_features.test@1.3.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_dd_sql_features.test -> mysql-test/suite/ndb/t/ndb_dd_sql_features.test

  mysql-test/suite/ndb/t/ndb_gis.test@1.6.1.1, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_gis.test -> mysql-test/suite/ndb/t/ndb_gis.test

  mysql-test/suite/ndb/t/ndb_grant.later@1.6, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_grant.later -> mysql-test/suite/ndb/t/ndb_grant.later

  mysql-test/suite/ndb/t/ndb_index.test@1.5.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_index.test -> mysql-test/suite/ndb/t/ndb_index.test

  mysql-test/suite/ndb/t/ndb_index_ordered.test@1.33.2.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_index_ordered.test -> mysql-test/suite/ndb/t/ndb_index_ordered.test

  mysql-test/suite/ndb/t/ndb_index_unique.test@1.29.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_index_unique.test -> mysql-test/suite/ndb/t/ndb_index_unique.test

  mysql-test/suite/ndb/t/ndb_insert.test@1.16.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_insert.test -> mysql-test/suite/ndb/t/ndb_insert.test

  mysql-test/suite/ndb/t/ndb_limit.test@1.4.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_limit.test -> mysql-test/suite/ndb/t/ndb_limit.test

  mysql-test/suite/ndb/t/ndb_load.test@1.3, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_load.test -> mysql-test/suite/ndb/t/ndb_load.test

  mysql-test/suite/ndb/t/ndb_loaddatalocal.test@1.2.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_loaddatalocal.test -> mysql-test/suite/ndb/t/ndb_loaddatalocal.test

  mysql-test/suite/ndb/t/ndb_lock.test@1.18.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_lock.test -> mysql-test/suite/ndb/t/ndb_lock.test

  mysql-test/suite/ndb/t/ndb_minmax.test@1.4.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_minmax.test -> mysql-test/suite/ndb/t/ndb_minmax.test

  mysql-test/suite/ndb/t/ndb_multi.test@1.18.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_multi.test -> mysql-test/suite/ndb/t/ndb_multi.test

  mysql-test/suite/ndb/t/ndb_multi_row.test@1.5, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_multi_row.test -> mysql-test/suite/ndb/t/ndb_multi_row.test

  mysql-test/suite/ndb/t/ndb_partition_error.test@1.2.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_partition_error.test -> mysql-test/suite/ndb/t/ndb_partition_error.test

  mysql-test/suite/ndb/t/ndb_partition_error2-master.opt@1.2, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_partition_error2-master.opt -> mysql-test/suite/ndb/t/ndb_partition_error2-master.opt

  mysql-test/suite/ndb/t/ndb_partition_error2.test@1.2, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_partition_error2.test -> mysql-test/suite/ndb/t/ndb_partition_error2.test

  mysql-test/suite/ndb/t/ndb_partition_key.test@1.3.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_partition_key.test -> mysql-test/suite/ndb/t/ndb_partition_key.test

  mysql-test/suite/ndb/t/ndb_partition_list.test@1.2.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_partition_list.test -> mysql-test/suite/ndb/t/ndb_partition_list.test

  mysql-test/suite/ndb/t/ndb_partition_range.test@1.2.1.1, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_partition_range.test -> mysql-test/suite/ndb/t/ndb_partition_range.test

  mysql-test/suite/ndb/t/ndb_read_multi_range.test@1.15.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_read_multi_range.test -> mysql-test/suite/ndb/t/ndb_read_multi_range.test

  mysql-test/suite/ndb/t/ndb_rename.test@1.1.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_rename.test -> mysql-test/suite/ndb/t/ndb_rename.test

  mysql-test/suite/ndb/t/ndb_replace.test@1.9.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_replace.test -> mysql-test/suite/ndb/t/ndb_replace.test

  mysql-test/suite/ndb/t/ndb_restore.test@1.26.1.4, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_restore.test -> mysql-test/suite/ndb/t/ndb_restore.test

  mysql-test/suite/ndb/t/ndb_restore_compat.test@1.5, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_restore_compat.test -> mysql-test/suite/ndb/t/ndb_restore_compat.test

  mysql-test/suite/ndb/t/ndb_restore_partition-master.opt@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_restore_partition-master.opt -> mysql-test/suite/ndb/t/ndb_restore_partition-master.opt

  mysql-test/suite/ndb/t/ndb_restore_partition.test@1.1.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_restore_partition.test -> mysql-test/suite/ndb/t/ndb_restore_partition.test

  mysql-test/suite/ndb/t/ndb_restore_print.test@1.3.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_restore_print.test -> mysql-test/suite/ndb/t/ndb_restore_print.test

  mysql-test/suite/ndb/t/ndb_row_format.test@1.2.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_row_format.test -> mysql-test/suite/ndb/t/ndb_row_format.test

  mysql-test/suite/ndb/t/ndb_single_user.test@1.7.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_single_user.test -> mysql-test/suite/ndb/t/ndb_single_user.test

  mysql-test/suite/ndb/t/ndb_sp.test@1.2.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_sp.test -> mysql-test/suite/ndb/t/ndb_sp.test

  mysql-test/suite/ndb/t/ndb_subquery.test@1.7.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_subquery.test -> mysql-test/suite/ndb/t/ndb_subquery.test

  mysql-test/suite/ndb/t/ndb_temporary.test@1.1.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_temporary.test -> mysql-test/suite/ndb/t/ndb_temporary.test

  mysql-test/suite/ndb/t/ndb_transaction.test@1.6.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_transaction.test -> mysql-test/suite/ndb/t/ndb_transaction.test

  mysql-test/suite/ndb/t/ndb_trigger.test@1.3.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_trigger.test -> mysql-test/suite/ndb/t/ndb_trigger.test

  mysql-test/suite/ndb/t/ndb_truncate.test@1.4.1.1, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_truncate.test -> mysql-test/suite/ndb/t/ndb_truncate.test

  mysql-test/suite/ndb/t/ndb_types.test@1.7.1.1, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_types.test -> mysql-test/suite/ndb/t/ndb_types.test

  mysql-test/suite/ndb/t/ndb_update.test@1.11.1.1, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_update.test -> mysql-test/suite/ndb/t/ndb_update.test

  mysql-test/suite/ndb/t/ndb_view.test@1.1.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndb_view.test -> mysql-test/suite/ndb/t/ndb_view.test

  mysql-test/suite/ndb/t/ndbapi.test@1.2.1.1, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ndbapi.test -> mysql-test/suite/ndb/t/ndbapi.test

  mysql-test/suite/ndb/t/partition_03ndb.test@1.2, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/partition_03ndb.test -> mysql-test/suite/ndb/t/partition_03ndb.test

  mysql-test/suite/ndb/t/ps_7ndb.test@1.6.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ps_7ndb.test -> mysql-test/suite/ndb/t/ps_7ndb.test

  mysql-test/suite/ndb/t/strict_autoinc_5ndb.test@1.1.1.1, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/strict_autoinc_5ndb.test -> mysql-test/suite/ndb/t/strict_autoinc_5ndb.test

  mysql-test/suite/rpl/r/rpl000001.a.result@1.7, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl000001.a.result -> mysql-test/suite/rpl/r/rpl000001.a.result

  mysql-test/suite/rpl/r/rpl000001.b.result@1.8, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl000001.b.result -> mysql-test/suite/rpl/r/rpl000001.b.result

  mysql-test/suite/rpl/r/rpl000010.result@1.11, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl000010.result -> mysql-test/suite/rpl/r/rpl000010.result

  mysql-test/suite/rpl/r/rpl000011.result@1.11, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl000011.result -> mysql-test/suite/rpl/r/rpl000011.result

  mysql-test/suite/rpl/r/rpl000013.result@1.13, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl000013.result -> mysql-test/suite/rpl/r/rpl000013.result

  mysql-test/suite/rpl/r/rpl000017.result@1.9, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl000017.result -> mysql-test/suite/rpl/r/rpl000017.result

  mysql-test/suite/rpl/r/rpl_000015.result@1.45.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_000015.result -> mysql-test/suite/rpl/r/rpl_000015.result

  mysql-test/suite/rpl/r/rpl_EE_err.result@1.8, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_EE_err.result -> mysql-test/suite/rpl/r/rpl_EE_err.result

  mysql-test/suite/rpl/r/rpl_LD_INFILE.result@1.4, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_LD_INFILE.result -> mysql-test/suite/rpl/r/rpl_LD_INFILE.result

  mysql-test/suite/rpl/r/rpl_alter.result@1.9, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_alter.result -> mysql-test/suite/rpl/r/rpl_alter.result

  mysql-test/suite/rpl/r/rpl_alter_db.result@1.2, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_alter_db.result -> mysql-test/suite/rpl/r/rpl_alter_db.result

  mysql-test/suite/rpl/r/rpl_auto_increment.result@1.8, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_auto_increment.result -> mysql-test/suite/rpl/r/rpl_auto_increment.result

  mysql-test/suite/rpl/r/rpl_auto_increment_11932.result@1.4, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_auto_increment_11932.result -> mysql-test/suite/rpl/r/rpl_auto_increment_11932.result

  mysql-test/suite/rpl/r/rpl_bit.result@1.3, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_bit.result -> mysql-test/suite/rpl/r/rpl_bit.result

  mysql-test/suite/rpl/r/rpl_bit_npk.result@1.4, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_bit_npk.result -> mysql-test/suite/rpl/r/rpl_bit_npk.result

  mysql-test/suite/rpl/r/rpl_change_master.result@1.24.2.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_change_master.result -> mysql-test/suite/rpl/r/rpl_change_master.result

  mysql-test/suite/rpl/r/rpl_charset_sjis.result@1.2, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_charset_sjis.result -> mysql-test/suite/rpl/r/rpl_charset_sjis.result

  mysql-test/suite/rpl/r/rpl_commit_after_flush.result@1.5, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_commit_after_flush.result -> mysql-test/suite/rpl/r/rpl_commit_after_flush.result

  mysql-test/suite/rpl/r/rpl_create_database.result@1.12, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_create_database.result -> mysql-test/suite/rpl/r/rpl_create_database.result

  mysql-test/suite/rpl/r/rpl_critical_errors.result@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_critical_errors.result -> mysql-test/suite/rpl/r/rpl_critical_errors.result

  mysql-test/suite/rpl/r/rpl_critical_errors.result.txt@1.2, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_critical_errors.result.txt -> mysql-test/suite/rpl/r/rpl_critical_errors.result.txt

  mysql-test/suite/rpl/r/rpl_ddl.result@1.19, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ddl.result -> mysql-test/suite/rpl/r/rpl_ddl.result

  mysql-test/suite/rpl/r/rpl_deadlock_innodb.result@1.20.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_deadlock_innodb.result -> mysql-test/suite/rpl/r/rpl_deadlock_innodb.result

  mysql-test/suite/rpl/r/rpl_delete_no_where.result@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_delete_no_where.result -> mysql-test/suite/rpl/r/rpl_delete_no_where.result

  mysql-test/suite/rpl/r/rpl_do_grant.result@1.8, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_do_grant.result -> mysql-test/suite/rpl/r/rpl_do_grant.result

  mysql-test/suite/rpl/r/rpl_drop.result@1.4, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_drop.result -> mysql-test/suite/rpl/r/rpl_drop.result

  mysql-test/suite/rpl/r/rpl_drop_db.result@1.11, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_drop_db.result -> mysql-test/suite/rpl/r/rpl_drop_db.result

  mysql-test/suite/rpl/r/rpl_drop_temp.result@1.5, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_drop_temp.result -> mysql-test/suite/rpl/r/rpl_drop_temp.result

  mysql-test/suite/rpl/r/rpl_dual_pos_advance.result@1.3, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_dual_pos_advance.result -> mysql-test/suite/rpl/r/rpl_dual_pos_advance.result

  mysql-test/suite/rpl/r/rpl_empty_master_crash.result@1.15.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_empty_master_crash.result -> mysql-test/suite/rpl/r/rpl_empty_master_crash.result

  mysql-test/suite/rpl/r/rpl_err_ignoredtable.result@1.29, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_err_ignoredtable.result -> mysql-test/suite/rpl/r/rpl_err_ignoredtable.result

  mysql-test/suite/rpl/r/rpl_events.result@1.6.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_events.result -> mysql-test/suite/rpl/r/rpl_events.result

  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@1.3.1.1, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_extraCol_innodb.result -> mysql-test/suite/rpl/r/rpl_extraCol_innodb.result

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.3.1.1, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_extraCol_myisam.result -> mysql-test/suite/rpl/r/rpl_extraCol_myisam.result

  mysql-test/suite/rpl/r/rpl_failed_optimize.result@1.8, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_failed_optimize.result -> mysql-test/suite/rpl/r/rpl_failed_optimize.result

  mysql-test/suite/rpl/r/rpl_flushlog_loop.result@1.30.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_flushlog_loop.result -> mysql-test/suite/rpl/r/rpl_flushlog_loop.result

  mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result@1.5, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_foreign_key_innodb.result -> mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result

  mysql-test/suite/rpl/r/rpl_free_items.result@1.4, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_free_items.result -> mysql-test/suite/rpl/r/rpl_free_items.result

  mysql-test/suite/rpl/r/rpl_get_lock.result@1.16, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_get_lock.result -> mysql-test/suite/rpl/r/rpl_get_lock.result

  mysql-test/suite/rpl/r/rpl_ignore_grant.result@1.5, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ignore_grant.result -> mysql-test/suite/rpl/r/rpl_ignore_grant.result

  mysql-test/suite/rpl/r/rpl_ignore_revoke.result@1.5, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ignore_revoke.result -> mysql-test/suite/rpl/r/rpl_ignore_revoke.result

  mysql-test/suite/rpl/r/rpl_ignore_table.result@1.7, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ignore_table.result -> mysql-test/suite/rpl/r/rpl_ignore_table.result

  mysql-test/suite/rpl/r/rpl_ignore_table_update.result@1.12, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ignore_table_update.result -> mysql-test/suite/rpl/r/rpl_ignore_table_update.result

  mysql-test/suite/rpl/r/rpl_incident.result@1.6.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_incident.result -> mysql-test/suite/rpl/r/rpl_incident.result

  mysql-test/suite/rpl/r/rpl_init_slave.result@1.6, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_init_slave.result -> mysql-test/suite/rpl/r/rpl_init_slave.result

  mysql-test/suite/rpl/r/rpl_innodb.result@1.2.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_innodb.result -> mysql-test/suite/rpl/r/rpl_innodb.result

  mysql-test/suite/rpl/r/rpl_insert.result@1.4, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_insert.result -> mysql-test/suite/rpl/r/rpl_insert.result

  mysql-test/suite/rpl/r/rpl_insert_id.result@1.31, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_insert_id.result -> mysql-test/suite/rpl/r/rpl_insert_id.result

  mysql-test/suite/rpl/r/rpl_insert_id_pk.result@1.4, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_insert_id_pk.result -> mysql-test/suite/rpl/r/rpl_insert_id_pk.result

  mysql-test/suite/rpl/r/rpl_insert_ignore.result@1.2, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_insert_ignore.result -> mysql-test/suite/rpl/r/rpl_insert_ignore.result

  mysql-test/suite/rpl/r/rpl_insert_select.result@1.3, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_insert_select.result -> mysql-test/suite/rpl/r/rpl_insert_select.result

  mysql-test/suite/rpl/r/rpl_known_bugs_detection.result@1.5.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_known_bugs_detection.result -> mysql-test/suite/rpl/r/rpl_known_bugs_detection.result

  mysql-test/suite/rpl/r/rpl_load_from_master.result@1.30, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_load_from_master.result -> mysql-test/suite/rpl/r/rpl_load_from_master.result

  mysql-test/suite/rpl/r/rpl_load_table_from_master.result@1.19, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_load_table_from_master.result -> mysql-test/suite/rpl/r/rpl_load_table_from_master.result

  mysql-test/suite/rpl/r/rpl_loaddata.result@1.44.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_loaddata.result -> mysql-test/suite/rpl/r/rpl_loaddata.result

  mysql-test/suite/rpl/r/rpl_loaddata_charset.result@1.3, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_loaddata_charset.result -> mysql-test/suite/rpl/r/rpl_loaddata_charset.result

  mysql-test/suite/rpl/r/rpl_loaddata_m.result@1.24, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_loaddata_m.result -> mysql-test/suite/rpl/r/rpl_loaddata_m.result

  mysql-test/suite/rpl/r/rpl_loaddata_s.result@1.17, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_loaddata_s.result -> mysql-test/suite/rpl/r/rpl_loaddata_s.result

  mysql-test/suite/rpl/r/rpl_loaddata_simple.result@1.6, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_loaddata_simple.result -> mysql-test/suite/rpl/r/rpl_loaddata_simple.result

  mysql-test/suite/rpl/r/rpl_loaddatalocal.result@1.9, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_loaddatalocal.result -> mysql-test/suite/rpl/r/rpl_loaddatalocal.result

  mysql-test/suite/rpl/r/rpl_loadfile.result@1.4, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_loadfile.result -> mysql-test/suite/rpl/r/rpl_loadfile.result

  mysql-test/suite/rpl/r/rpl_locale.result@1.3, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_locale.result -> mysql-test/suite/rpl/r/rpl_locale.result

  mysql-test/suite/rpl/r/rpl_log_pos.result@1.49.1.3, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_log_pos.result -> mysql-test/suite/rpl/r/rpl_log_pos.result

  mysql-test/suite/rpl/r/rpl_many_optimize.result@1.2, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_many_optimize.result -> mysql-test/suite/rpl/r/rpl_many_optimize.result

  mysql-test/suite/rpl/r/rpl_master_pos_wait.result@1.10, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_master_pos_wait.result -> mysql-test/suite/rpl/r/rpl_master_pos_wait.result

  mysql-test/suite/rpl/r/rpl_misc_functions.result@1.7, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_misc_functions.result -> mysql-test/suite/rpl/r/rpl_misc_functions.result

  mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result@1.23, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_mixed_ddl_dml.result -> mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result

  mysql-test/suite/rpl/r/rpl_multi_delete.result@1.7, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_multi_delete.result -> mysql-test/suite/rpl/r/rpl_multi_delete.result

  mysql-test/suite/rpl/r/rpl_multi_delete2.result@1.8, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_multi_delete2.result -> mysql-test/suite/rpl/r/rpl_multi_delete2.result

  mysql-test/suite/rpl/r/rpl_multi_engine.result@1.5, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_multi_engine.result -> mysql-test/suite/rpl/r/rpl_multi_engine.result

  mysql-test/suite/rpl/r/rpl_multi_update.result@1.9, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_multi_update.result -> mysql-test/suite/rpl/r/rpl_multi_update.result

  mysql-test/suite/rpl/r/rpl_multi_update2.result@1.5, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_multi_update2.result -> mysql-test/suite/rpl/r/rpl_multi_update2.result

  mysql-test/suite/rpl/r/rpl_multi_update3.result@1.11, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_multi_update3.result -> mysql-test/suite/rpl/r/rpl_multi_update3.result

  mysql-test/suite/rpl/r/rpl_multi_update4.result@1.3, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_multi_update4.result -> mysql-test/suite/rpl/r/rpl_multi_update4.result

  mysql-test/suite/rpl/r/rpl_optimize.result@1.4, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_optimize.result -> mysql-test/suite/rpl/r/rpl_optimize.result

  mysql-test/suite/rpl/r/rpl_packet.result@1.8, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_packet.result -> mysql-test/suite/rpl/r/rpl_packet.result

  mysql-test/suite/rpl/r/rpl_ps.result@1.4, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ps.result -> mysql-test/suite/rpl/r/rpl_ps.result

  mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result@1.7.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_rbr_to_sbr.result -> mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result

  mysql-test/suite/rpl/r/rpl_read_only.result@1.4, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_read_only.result -> mysql-test/suite/rpl/r/rpl_read_only.result

  mysql-test/suite/rpl/r/rpl_redirect.result@1.17.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_redirect.result -> mysql-test/suite/rpl/r/rpl_redirect.result

  mysql-test/suite/rpl/r/rpl_relay_space_innodb.result@1.4, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_relay_space_innodb.result -> mysql-test/suite/rpl/r/rpl_relay_space_innodb.result

  mysql-test/suite/rpl/r/rpl_relay_space_myisam.result@1.17, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_relay_space_myisam.result -> mysql-test/suite/rpl/r/rpl_relay_space_myisam.result

  mysql-test/suite/rpl/r/rpl_relayrotate.result@1.21, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_relayrotate.result -> mysql-test/suite/rpl/r/rpl_relayrotate.result

  mysql-test/suite/rpl/r/rpl_relayspace.result@1.5, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_relayspace.result -> mysql-test/suite/rpl/r/rpl_relayspace.result

  mysql-test/suite/rpl/r/rpl_replicate_do.result@1.39.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_replicate_do.result -> mysql-test/suite/rpl/r/rpl_replicate_do.result

  mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result@1.2, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_replicate_ignore_db.result -> mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result

  mysql-test/suite/rpl/r/rpl_rewrt_db.result@1.10, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_rewrt_db.result -> mysql-test/suite/rpl/r/rpl_rewrt_db.result

  mysql-test/suite/rpl/r/rpl_rotate_logs.result@1.78.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_rotate_logs.result -> mysql-test/suite/rpl/r/rpl_rotate_logs.result

  mysql-test/suite/rpl/r/rpl_row_001.result@1.4, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_001.result -> mysql-test/suite/rpl/r/rpl_row_001.result

  mysql-test/suite/rpl/r/rpl_row_4_bytes.result@1.3, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_4_bytes.result -> mysql-test/suite/rpl/r/rpl_row_4_bytes.result

  mysql-test/suite/rpl/r/rpl_row_NOW.result@1.3, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_NOW.result -> mysql-test/suite/rpl/r/rpl_row_NOW.result

  mysql-test/suite/rpl/r/rpl_row_USER.result@1.5, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_USER.result -> mysql-test/suite/rpl/r/rpl_row_USER.result

  mysql-test/suite/rpl/r/rpl_row_UUID.result@1.4.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_UUID.result -> mysql-test/suite/rpl/r/rpl_row_UUID.result

  mysql-test/suite/rpl/r/rpl_row_basic_11bugs-master.opt@1.2, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_basic_11bugs-master.opt -> mysql-test/suite/rpl/r/rpl_row_basic_11bugs-master.opt

  mysql-test/suite/rpl/r/rpl_row_basic_11bugs-slave.opt@1.2, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_basic_11bugs-slave.opt -> mysql-test/suite/rpl/r/rpl_row_basic_11bugs-slave.opt

  mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result@1.16.1.1, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_basic_11bugs.result -> mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result

  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result@1.4, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_basic_2myisam.result -> mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result

  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result@1.4, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_basic_3innodb.result -> mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result

  mysql-test/suite/rpl/r/rpl_row_basic_8partition.result@1.5, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_basic_8partition.result -> mysql-test/suite/rpl/r/rpl_row_basic_8partition.result

  mysql-test/suite/rpl/r/rpl_row_blob_innodb.result@1.6, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_blob_innodb.result -> mysql-test/suite/rpl/r/rpl_row_blob_innodb.result

  mysql-test/suite/rpl/r/rpl_row_blob_myisam.result@1.6, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_blob_myisam.result -> mysql-test/suite/rpl/r/rpl_row_blob_myisam.result

  mysql-test/suite/rpl/r/rpl_row_charset.result@1.9, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_charset.result -> mysql-test/suite/rpl/r/rpl_row_charset.result

  mysql-test/suite/rpl/r/rpl_row_create_table.result@1.13, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_create_table.result -> mysql-test/suite/rpl/r/rpl_row_create_table.result

  mysql-test/suite/rpl/r/rpl_row_delayed_ins.result@1.10, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_delayed_ins.result -> mysql-test/suite/rpl/r/rpl_row_delayed_ins.result

  mysql-test/suite/rpl/r/rpl_row_drop.result@1.7, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_drop.result -> mysql-test/suite/rpl/r/rpl_row_drop.result

  mysql-test/suite/rpl/r/rpl_row_err_ignoredtable.result@1.2, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_err_ignoredtable.result -> mysql-test/suite/rpl/r/rpl_row_err_ignoredtable.result

  mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result@1.6, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_flsh_tbls.result -> mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result

  mysql-test/suite/rpl/r/rpl_row_func001.result@1.2, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_func001.result -> mysql-test/suite/rpl/r/rpl_row_func001.result

  mysql-test/suite/rpl/r/rpl_row_func002.result@1.3, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_func002.result -> mysql-test/suite/rpl/r/rpl_row_func002.result

  mysql-test/suite/rpl/r/rpl_row_func003.result@1.2, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_func003.result -> mysql-test/suite/rpl/r/rpl_row_func003.result

  mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result@1.7.1.1, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_inexist_tbl.result -> mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result

  mysql-test/suite/rpl/r/rpl_row_insert_delayed.result@1.2, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_insert_delayed.result -> mysql-test/suite/rpl/r/rpl_row_insert_delayed.result

  mysql-test/suite/rpl/r/rpl_row_loaddata_m.result@1.3, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_loaddata_m.result -> mysql-test/suite/rpl/r/rpl_row_loaddata_m.result

  mysql-test/suite/rpl/r/rpl_row_log.result@1.17.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_log.result -> mysql-test/suite/rpl/r/rpl_row_log.result

  mysql-test/suite/rpl/r/rpl_row_log_innodb.result@1.17.1.1, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_log_innodb.result -> mysql-test/suite/rpl/r/rpl_row_log_innodb.result

  mysql-test/suite/rpl/r/rpl_row_max_relay_size.result@1.9.1.1, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_max_relay_size.result -> mysql-test/suite/rpl/r/rpl_row_max_relay_size.result

  mysql-test/suite/rpl/r/rpl_row_multi_query.result@1.2, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_multi_query.result -> mysql-test/suite/rpl/r/rpl_row_multi_query.result

  mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result@1.6, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_mysqlbinlog.result -> mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result

  mysql-test/suite/rpl/r/rpl_row_mystery22.result@1.2, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_mystery22.result -> mysql-test/suite/rpl/r/rpl_row_mystery22.result

  mysql-test/suite/rpl/r/rpl_row_reset_slave.result@1.5.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_reset_slave.result -> mysql-test/suite/rpl/r/rpl_row_reset_slave.result

  mysql-test/suite/rpl/r/rpl_row_sp001.result@1.3, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_sp001.result -> mysql-test/suite/rpl/r/rpl_row_sp001.result

  mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result@1.2, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_sp002_innodb.result -> mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result

  mysql-test/suite/rpl/r/rpl_row_sp003.result@1.3, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_sp003.result -> mysql-test/suite/rpl/r/rpl_row_sp003.result

  mysql-test/suite/rpl/r/rpl_row_sp005.result@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_sp005.result -> mysql-test/suite/rpl/r/rpl_row_sp005.result

  mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result@1.3, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_sp006_InnoDB.result -> mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result

  mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result@1.2, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_sp007_innodb.result -> mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result

  mysql-test/suite/rpl/r/rpl_row_sp008.result@1.6, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_sp008.result -> mysql-test/suite/rpl/r/rpl_row_sp008.result

  mysql-test/suite/rpl/r/rpl_row_sp009.result@1.3, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_sp009.result -> mysql-test/suite/rpl/r/rpl_row_sp009.result

  mysql-test/suite/rpl/r/rpl_row_sp010.result@1.3, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_sp010.result -> mysql-test/suite/rpl/r/rpl_row_sp010.result

  mysql-test/suite/rpl/r/rpl_row_sp011.result@1.2, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_sp011.result -> mysql-test/suite/rpl/r/rpl_row_sp011.result

  mysql-test/suite/rpl/r/rpl_row_sp012.result@1.3, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_sp012.result -> mysql-test/suite/rpl/r/rpl_row_sp012.result

  mysql-test/suite/rpl/r/rpl_row_stop_middle.result@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_stop_middle.result -> mysql-test/suite/rpl/r/rpl_row_stop_middle.result

  mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result@1.3, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_stop_middle_update.result -> mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.11.1.1, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_tabledefs_2myisam.result -> mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.8.1.1, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_tabledefs_3innodb.result -> mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result

  mysql-test/suite/rpl/r/rpl_row_tabledefs_7ndb.result@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_tabledefs_7ndb.result -> mysql-test/suite/rpl/r/rpl_row_tabledefs_7ndb.result

  mysql-test/suite/rpl/r/rpl_row_trig001.result@1.3, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_trig001.result -> mysql-test/suite/rpl/r/rpl_row_trig001.result

  mysql-test/suite/rpl/r/rpl_row_trig002.result@1.3, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_trig002.result -> mysql-test/suite/rpl/r/rpl_row_trig002.result

  mysql-test/suite/rpl/r/rpl_row_trig003.result@1.2, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_trig003.result -> mysql-test/suite/rpl/r/rpl_row_trig003.result

  mysql-test/suite/rpl/r/rpl_row_trig004.result@1.3, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_trig004.result -> mysql-test/suite/rpl/r/rpl_row_trig004.result

  mysql-test/suite/rpl/r/rpl_row_until.result@1.6.1.1, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_until.result -> mysql-test/suite/rpl/r/rpl_row_until.result

  mysql-test/suite/rpl/r/rpl_row_view01.result@1.4, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_view01.result -> mysql-test/suite/rpl/r/rpl_row_view01.result

  mysql-test/suite/rpl/r/rpl_server_id1.result@1.15.1.1, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_server_id1.result -> mysql-test/suite/rpl/r/rpl_server_id1.result

  mysql-test/suite/rpl/r/rpl_server_id2.result@1.16.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_server_id2.result -> mysql-test/suite/rpl/r/rpl_server_id2.result

  mysql-test/suite/rpl/r/rpl_session_var.result@1.6, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_session_var.result -> mysql-test/suite/rpl/r/rpl_session_var.result

  mysql-test/suite/rpl/r/rpl_set_charset.result@1.6, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_set_charset.result -> mysql-test/suite/rpl/r/rpl_set_charset.result

  mysql-test/suite/rpl/r/rpl_sf.result@1.2, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_sf.result -> mysql-test/suite/rpl/r/rpl_sf.result

  mysql-test/suite/rpl/r/rpl_skip_error.result@1.8.1.1, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_skip_error.result -> mysql-test/suite/rpl/r/rpl_skip_error.result

  mysql-test/suite/rpl/r/rpl_slave_status.result@1.10.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_slave_status.result -> mysql-test/suite/rpl/r/rpl_slave_status.result

  mysql-test/suite/rpl/r/rpl_sp.result@1.39.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_sp.result -> mysql-test/suite/rpl/r/rpl_sp.result

  mysql-test/suite/rpl/r/rpl_sp004.result@1.3, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_sp004.result -> mysql-test/suite/rpl/r/rpl_sp004.result

  mysql-test/suite/rpl/r/rpl_sp_effects.result@1.7, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_sp_effects.result -> mysql-test/suite/rpl/r/rpl_sp_effects.result

  mysql-test/suite/rpl/r/rpl_sporadic_master.result@1.9, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_sporadic_master.result -> mysql-test/suite/rpl/r/rpl_sporadic_master.result

  mysql-test/suite/rpl/r/rpl_ssl.result@1.8.1.3, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ssl.result -> mysql-test/suite/rpl/r/rpl_ssl.result

  mysql-test/suite/rpl/r/rpl_ssl1.result@1.17.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ssl1.result -> mysql-test/suite/rpl/r/rpl_ssl1.result

  mysql-test/suite/rpl/r/rpl_start_stop_slave.result@1.9, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_start_stop_slave.result -> mysql-test/suite/rpl/r/rpl_start_stop_slave.result

  mysql-test/suite/rpl/r/rpl_stm_000001.result@1.36, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_stm_000001.result -> mysql-test/suite/rpl/r/rpl_stm_000001.result

  mysql-test/suite/rpl/r/rpl_stm_EE_err2.result@1.4, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_stm_EE_err2.result -> mysql-test/suite/rpl/r/rpl_stm_EE_err2.result

  mysql-test/suite/rpl/r/rpl_stm_charset.result@1.29, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_stm_charset.result -> mysql-test/suite/rpl/r/rpl_stm_charset.result

  mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result@1.18, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_stm_flsh_tbls.result -> mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result

  mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result@1.2, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_stm_insert_delayed.result -> mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result

  mysql-test/suite/rpl/r/rpl_stm_log.result@1.79.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_stm_log.result -> mysql-test/suite/rpl/r/rpl_stm_log.result

  mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result@1.30.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_stm_max_relay_size.result -> mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result

  mysql-test/suite/rpl/r/rpl_stm_multi_query.result@1.9, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_stm_multi_query.result -> mysql-test/suite/rpl/r/rpl_stm_multi_query.result

  mysql-test/suite/rpl/r/rpl_stm_mystery22.result@1.7, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_stm_mystery22.result -> mysql-test/suite/rpl/r/rpl_stm_mystery22.result

  mysql-test/suite/rpl/r/rpl_stm_no_op.result@1.3, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_stm_no_op.result -> mysql-test/suite/rpl/r/rpl_stm_no_op.result

  mysql-test/suite/rpl/r/rpl_stm_reset_slave.result@1.18.1.1, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_stm_reset_slave.result -> mysql-test/suite/rpl/r/rpl_stm_reset_slave.result

  mysql-test/suite/rpl/r/rpl_stm_until.result@1.30.1.1, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_stm_until.result -> mysql-test/suite/rpl/r/rpl_stm_until.result

  mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result@1.23, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_switch_stm_row_mixed.result -> mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result

  mysql-test/suite/rpl/r/rpl_temp_table.result@1.16, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_temp_table.result -> mysql-test/suite/rpl/r/rpl_temp_table.result

  mysql-test/suite/rpl/r/rpl_temporary.result@1.33, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_temporary.result -> mysql-test/suite/rpl/r/rpl_temporary.result

  mysql-test/suite/rpl/r/rpl_timezone.result@1.22, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_timezone.result -> mysql-test/suite/rpl/r/rpl_timezone.result

  mysql-test/suite/rpl/r/rpl_trigger.result@1.12, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_trigger.result -> mysql-test/suite/rpl/r/rpl_trigger.result

  mysql-test/suite/rpl/r/rpl_trunc_temp.result@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_trunc_temp.result -> mysql-test/suite/rpl/r/rpl_trunc_temp.result

  mysql-test/suite/rpl/r/rpl_truncate_2myisam.result@1.7, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_truncate_2myisam.result -> mysql-test/suite/rpl/r/rpl_truncate_2myisam.result

  mysql-test/suite/rpl/r/rpl_truncate_3innodb.result@1.7, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_truncate_3innodb.result -> mysql-test/suite/rpl/r/rpl_truncate_3innodb.result

  mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_truncate_7ndb_2.result -> mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result

  mysql-test/suite/rpl/r/rpl_udf.result@1.4.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_udf.result -> mysql-test/suite/rpl/r/rpl_udf.result

  mysql-test/suite/rpl/r/rpl_user_variables.result@1.26, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_user_variables.result -> mysql-test/suite/rpl/r/rpl_user_variables.result

  mysql-test/suite/rpl/r/rpl_variables.result@1.6, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_variables.result -> mysql-test/suite/rpl/r/rpl_variables.result

  mysql-test/suite/rpl/r/rpl_view.result@1.16, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_view.result -> mysql-test/suite/rpl/r/rpl_view.result

  mysql-test/suite/rpl/t/disabled.def@1.1, 2007-06-27 14:27:58+02:00, msvensson@pilot.(none) +15 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/disabled.def''

  mysql-test/suite/rpl/t/disabled.def@1.0, 2007-06-27 14:27:58+02:00, msvensson@pilot.(none) +0 -0

  mysql-test/suite/rpl/t/rpl000010-slave.opt@1.6, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl000010-slave.opt -> mysql-test/suite/rpl/t/rpl000010-slave.opt

  mysql-test/suite/rpl/t/rpl000010.test@1.14, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl000010.test -> mysql-test/suite/rpl/t/rpl000010.test

  mysql-test/suite/rpl/t/rpl000011.test@1.16, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl000011.test -> mysql-test/suite/rpl/t/rpl000011.test

  mysql-test/suite/rpl/t/rpl000013.test@1.20, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl000013.test -> mysql-test/suite/rpl/t/rpl000013.test

  mysql-test/suite/rpl/t/rpl000017-slave.opt@1.3, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl000017-slave.opt -> mysql-test/suite/rpl/t/rpl000017-slave.opt

  mysql-test/suite/rpl/t/rpl000017-slave.sh@1.12, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl000017-slave.sh -> mysql-test/suite/rpl/t/rpl000017-slave.sh

  mysql-test/suite/rpl/t/rpl000017.test@1.19, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl000017.test -> mysql-test/suite/rpl/t/rpl000017.test

  mysql-test/suite/rpl/t/rpl000018-master.opt@1.3, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl000018-master.opt -> mysql-test/suite/rpl/t/rpl000018-master.opt

  mysql-test/suite/rpl/t/rpl000018-slave.opt@1.3, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl000018-slave.opt -> mysql-test/suite/rpl/t/rpl000018-slave.opt

  mysql-test/suite/rpl/t/rpl_000015-slave.sh@1.6, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_000015-slave.sh -> mysql-test/suite/rpl/t/rpl_000015-slave.sh

  mysql-test/suite/rpl/t/rpl_000015.slave-mi@1.9, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_000015.slave-mi -> mysql-test/suite/rpl/t/rpl_000015.slave-mi

  mysql-test/suite/rpl/t/rpl_000015.test@1.42.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_000015.test -> mysql-test/suite/rpl/t/rpl_000015.test

  mysql-test/suite/rpl/t/rpl_EE_err.test@1.5, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_EE_err.test -> mysql-test/suite/rpl/t/rpl_EE_err.test

  mysql-test/suite/rpl/t/rpl_LD_INFILE.test@1.5, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_LD_INFILE.test -> mysql-test/suite/rpl/t/rpl_LD_INFILE.test

  mysql-test/suite/rpl/t/rpl_alter.test@1.9, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_alter.test -> mysql-test/suite/rpl/t/rpl_alter.test

  mysql-test/suite/rpl/t/rpl_alter_db.test@1.2, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_alter_db.test -> mysql-test/suite/rpl/t/rpl_alter_db.test

  mysql-test/suite/rpl/t/rpl_auto_increment-master.opt@1.2, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_auto_increment-master.opt -> mysql-test/suite/rpl/t/rpl_auto_increment-master.opt

  mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt@1.3, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_auto_increment-slave.opt -> mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt

  mysql-test/suite/rpl/t/rpl_auto_increment.test@1.6, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_auto_increment.test -> mysql-test/suite/rpl/t/rpl_auto_increment.test

  mysql-test/suite/rpl/t/rpl_auto_increment_11932.test@1.4, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_auto_increment_11932.test -> mysql-test/suite/rpl/t/rpl_auto_increment_11932.test

  mysql-test/suite/rpl/t/rpl_bit.test@1.3, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_bit.test -> mysql-test/suite/rpl/t/rpl_bit.test

  mysql-test/suite/rpl/t/rpl_bit_npk.test@1.3, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_bit_npk.test -> mysql-test/suite/rpl/t/rpl_bit_npk.test

  mysql-test/suite/rpl/t/rpl_change_master.test@1.17.2.1, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_change_master.test -> mysql-test/suite/rpl/t/rpl_change_master.test

  mysql-test/suite/rpl/t/rpl_charset_sjis.test@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_charset_sjis.test -> mysql-test/suite/rpl/t/rpl_charset_sjis.test

  mysql-test/suite/rpl/t/rpl_commit_after_flush.test@1.10.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_commit_after_flush.test -> mysql-test/suite/rpl/t/rpl_commit_after_flush.test

  mysql-test/suite/rpl/t/rpl_create_database-master.opt@1.2, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_create_database-master.opt -> mysql-test/suite/rpl/t/rpl_create_database-master.opt

  mysql-test/suite/rpl/t/rpl_create_database-slave.opt@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_create_database-slave.opt -> mysql-test/suite/rpl/t/rpl_create_database-slave.opt

  mysql-test/suite/rpl/t/rpl_create_database.test@1.7, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_create_database.test -> mysql-test/suite/rpl/t/rpl_create_database.test

  mysql-test/suite/rpl/t/rpl_critical_errors.test@1.3, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_critical_errors.test -> mysql-test/suite/rpl/t/rpl_critical_errors.test

  mysql-test/suite/rpl/t/rpl_ddl.test@1.6, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ddl.test -> mysql-test/suite/rpl/t/rpl_ddl.test

  mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt@1.4, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_deadlock_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt

  mysql-test/suite/rpl/t/rpl_deadlock_innodb.test@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_deadlock_innodb.test -> mysql-test/suite/rpl/t/rpl_deadlock_innodb.test

  mysql-test/suite/rpl/t/rpl_delete_no_where.test@1.3.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_delete_no_where.test -> mysql-test/suite/rpl/t/rpl_delete_no_where.test

  mysql-test/suite/rpl/t/rpl_do_grant.test@1.9, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_do_grant.test -> mysql-test/suite/rpl/t/rpl_do_grant.test

  mysql-test/suite/rpl/t/rpl_drop.test@1.10, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_drop.test -> mysql-test/suite/rpl/t/rpl_drop.test

  mysql-test/suite/rpl/t/rpl_drop_db.test@1.15, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_drop_db.test -> mysql-test/suite/rpl/t/rpl_drop_db.test

  mysql-test/suite/rpl/t/rpl_drop_temp-slave.opt@1.2, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_drop_temp-slave.opt -> mysql-test/suite/rpl/t/rpl_drop_temp-slave.opt

  mysql-test/suite/rpl/t/rpl_drop_temp.test@1.10, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_drop_temp.test -> mysql-test/suite/rpl/t/rpl_drop_temp.test

  mysql-test/suite/rpl/t/rpl_dual_pos_advance-master.opt@1.4, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_dual_pos_advance-master.opt -> mysql-test/suite/rpl/t/rpl_dual_pos_advance-master.opt

  mysql-test/suite/rpl/t/rpl_dual_pos_advance.test@1.4, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_dual_pos_advance.test -> mysql-test/suite/rpl/t/rpl_dual_pos_advance.test

  mysql-test/suite/rpl/t/rpl_empty_master_crash-master.opt@1.2, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_empty_master_crash-master.opt -> mysql-test/suite/rpl/t/rpl_empty_master_crash-master.opt

  mysql-test/suite/rpl/t/rpl_empty_master_crash.test@1.13.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_empty_master_crash.test -> mysql-test/suite/rpl/t/rpl_empty_master_crash.test

  mysql-test/suite/rpl/t/rpl_err_ignoredtable-slave.opt@1.8, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_err_ignoredtable-slave.opt -> mysql-test/suite/rpl/t/rpl_err_ignoredtable-slave.opt

  mysql-test/suite/rpl/t/rpl_err_ignoredtable.test@1.30, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_err_ignoredtable.test -> mysql-test/suite/rpl/t/rpl_err_ignoredtable.test

  mysql-test/suite/rpl/t/rpl_events.test@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_events.test -> mysql-test/suite/rpl/t/rpl_events.test

  mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_extraCol_innodb-master.opt -> mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt

  mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt@1.2, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_extraCol_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt

  mysql-test/suite/rpl/t/rpl_extraCol_innodb.test@1.2, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_extraCol_innodb.test -> mysql-test/suite/rpl/t/rpl_extraCol_innodb.test

  mysql-test/suite/rpl/t/rpl_extraCol_myisam.test@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_extraCol_myisam.test -> mysql-test/suite/rpl/t/rpl_extraCol_myisam.test

  mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt@1.3, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_failed_optimize-master.opt -> mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt

  mysql-test/suite/rpl/t/rpl_failed_optimize.test@1.6, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_failed_optimize.test -> mysql-test/suite/rpl/t/rpl_failed_optimize.test

  mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt@1.7, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_flushlog_loop-master.opt -> mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt

  mysql-test/suite/rpl/t/rpl_flushlog_loop-master.sh@1.6, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_flushlog_loop-master.sh -> mysql-test/suite/rpl/t/rpl_flushlog_loop-master.sh

  mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt@1.7, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_flushlog_loop-slave.opt -> mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt

  mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.sh@1.6, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_flushlog_loop-slave.sh -> mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.sh

  mysql-test/suite/rpl/t/rpl_flushlog_loop.test@1.17.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_flushlog_loop.test -> mysql-test/suite/rpl/t/rpl_flushlog_loop.test

  mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_foreign_key_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt

  mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test@1.5, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_foreign_key_innodb.test -> mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test

  mysql-test/suite/rpl/t/rpl_free_items-slave.opt@1.4, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_free_items-slave.opt -> mysql-test/suite/rpl/t/rpl_free_items-slave.opt

  mysql-test/suite/rpl/t/rpl_free_items.test@1.7, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_free_items.test -> mysql-test/suite/rpl/t/rpl_free_items.test

  mysql-test/suite/rpl/t/rpl_get_lock.test@1.16, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_get_lock.test -> mysql-test/suite/rpl/t/rpl_get_lock.test

  mysql-test/suite/rpl/t/rpl_ignore_grant-slave.opt@1.4, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ignore_grant-slave.opt -> mysql-test/suite/rpl/t/rpl_ignore_grant-slave.opt

  mysql-test/suite/rpl/t/rpl_ignore_grant.test@1.6, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ignore_grant.test -> mysql-test/suite/rpl/t/rpl_ignore_grant.test

  mysql-test/suite/rpl/t/rpl_ignore_revoke-slave.opt@1.2, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ignore_revoke-slave.opt -> mysql-test/suite/rpl/t/rpl_ignore_revoke-slave.opt

  mysql-test/suite/rpl/t/rpl_ignore_revoke.test@1.4, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ignore_revoke.test -> mysql-test/suite/rpl/t/rpl_ignore_revoke.test

  mysql-test/suite/rpl/t/rpl_ignore_table-slave.opt@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ignore_table-slave.opt -> mysql-test/suite/rpl/t/rpl_ignore_table-slave.opt

  mysql-test/suite/rpl/t/rpl_ignore_table.test@1.8, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ignore_table.test -> mysql-test/suite/rpl/t/rpl_ignore_table.test

  mysql-test/suite/rpl/t/rpl_ignore_table_update-slave.opt@1.7, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ignore_table_update-slave.opt -> mysql-test/suite/rpl/t/rpl_ignore_table_update-slave.opt

  mysql-test/suite/rpl/t/rpl_ignore_table_update.test@1.16, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ignore_table_update.test -> mysql-test/suite/rpl/t/rpl_ignore_table_update.test

  mysql-test/suite/rpl/t/rpl_incident-master.opt@1.2, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_incident-master.opt -> mysql-test/suite/rpl/t/rpl_incident-master.opt

  mysql-test/suite/rpl/t/rpl_incident.test@1.5, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_incident.test -> mysql-test/suite/rpl/t/rpl_incident.test

  mysql-test/suite/rpl/t/rpl_init_slave-slave.opt@1.4, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_init_slave-slave.opt -> mysql-test/suite/rpl/t/rpl_init_slave-slave.opt

  mysql-test/suite/rpl/t/rpl_init_slave.test@1.6, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_init_slave.test -> mysql-test/suite/rpl/t/rpl_init_slave.test

  mysql-test/suite/rpl/t/rpl_innodb.test@1.3.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_innodb.test -> mysql-test/suite/rpl/t/rpl_innodb.test

  mysql-test/suite/rpl/t/rpl_insert.test@1.7, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_insert.test -> mysql-test/suite/rpl/t/rpl_insert.test

  mysql-test/suite/rpl/t/rpl_insert_id-slave.opt@1.4, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_insert_id-slave.opt -> mysql-test/suite/rpl/t/rpl_insert_id-slave.opt

  mysql-test/suite/rpl/t/rpl_insert_id.test@1.28, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_insert_id.test -> mysql-test/suite/rpl/t/rpl_insert_id.test

  mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt@1.3, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_insert_id_pk-slave.opt -> mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt

  mysql-test/suite/rpl/t/rpl_insert_id_pk.test@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_insert_id_pk.test -> mysql-test/suite/rpl/t/rpl_insert_id_pk.test

  mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt@1.3, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_insert_ignore-slave.opt -> mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt

  mysql-test/suite/rpl/t/rpl_insert_ignore.test@1.6.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_insert_ignore.test -> mysql-test/suite/rpl/t/rpl_insert_ignore.test

  mysql-test/suite/rpl/t/rpl_insert_select.test@1.2, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_insert_select.test -> mysql-test/suite/rpl/t/rpl_insert_select.test

  mysql-test/suite/rpl/t/rpl_known_bugs_detection-master.opt@1.2, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_known_bugs_detection-master.opt -> mysql-test/suite/rpl/t/rpl_known_bugs_detection-master.opt

  mysql-test/suite/rpl/t/rpl_known_bugs_detection.test@1.6, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_known_bugs_detection.test -> mysql-test/suite/rpl/t/rpl_known_bugs_detection.test

  mysql-test/suite/rpl/t/rpl_load_from_master-slave.opt@1.7, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_load_from_master-slave.opt -> mysql-test/suite/rpl/t/rpl_load_from_master-slave.opt

  mysql-test/suite/rpl/t/rpl_load_from_master.test@1.28, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_load_from_master.test -> mysql-test/suite/rpl/t/rpl_load_from_master.test

  mysql-test/suite/rpl/t/rpl_load_table_from_master.test@1.9, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_load_table_from_master.test -> mysql-test/suite/rpl/t/rpl_load_table_from_master.test

  mysql-test/suite/rpl/t/rpl_loaddata.test@1.31, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_loaddata.test -> mysql-test/suite/rpl/t/rpl_loaddata.test

  mysql-test/suite/rpl/t/rpl_loaddata_charset.test@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_loaddata_charset.test -> mysql-test/suite/rpl/t/rpl_loaddata_charset.test

  mysql-test/suite/rpl/t/rpl_loaddata_m-master.opt@1.6, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_loaddata_m-master.opt -> mysql-test/suite/rpl/t/rpl_loaddata_m-master.opt

  mysql-test/suite/rpl/t/rpl_loaddata_m.test@1.21, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_loaddata_m.test -> mysql-test/suite/rpl/t/rpl_loaddata_m.test

  mysql-test/suite/rpl/t/rpl_loaddata_s-slave.opt@1.5, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_loaddata_s-slave.opt -> mysql-test/suite/rpl/t/rpl_loaddata_s-slave.opt

  mysql-test/suite/rpl/t/rpl_loaddata_s.test@1.19, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_loaddata_s.test -> mysql-test/suite/rpl/t/rpl_loaddata_s.test

  mysql-test/suite/rpl/t/rpl_loaddata_simple.test@1.6, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_loaddata_simple.test -> mysql-test/suite/rpl/t/rpl_loaddata_simple.test

  mysql-test/suite/rpl/t/rpl_loaddatalocal.test@1.12, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_loaddatalocal.test -> mysql-test/suite/rpl/t/rpl_loaddatalocal.test

  mysql-test/suite/rpl/t/rpl_loadfile.test@1.6, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_loadfile.test -> mysql-test/suite/rpl/t/rpl_loadfile.test

  mysql-test/suite/rpl/t/rpl_locale.test@1.3, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_locale.test -> mysql-test/suite/rpl/t/rpl_locale.test

  mysql-test/suite/rpl/t/rpl_log_pos.test@1.39.1.3, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_log_pos.test -> mysql-test/suite/rpl/t/rpl_log_pos.test

  mysql-test/suite/rpl/t/rpl_many_optimize.test@1.3, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_many_optimize.test -> mysql-test/suite/rpl/t/rpl_many_optimize.test

  mysql-test/suite/rpl/t/rpl_master_pos_wait.test@1.7, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_master_pos_wait.test -> mysql-test/suite/rpl/t/rpl_master_pos_wait.test

  mysql-test/suite/rpl/t/rpl_misc_functions-slave.sh@1.4, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_misc_functions-slave.sh -> mysql-test/suite/rpl/t/rpl_misc_functions-slave.sh

  mysql-test/suite/rpl/t/rpl_misc_functions.test@1.10, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_misc_functions.test -> mysql-test/suite/rpl/t/rpl_misc_functions.test

  mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test@1.24, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_mixed_ddl_dml.test -> mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test

  mysql-test/suite/rpl/t/rpl_multi_delete-slave.opt@1.4, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_multi_delete-slave.opt -> mysql-test/suite/rpl/t/rpl_multi_delete-slave.opt

  mysql-test/suite/rpl/t/rpl_multi_delete.test@1.9, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_multi_delete.test -> mysql-test/suite/rpl/t/rpl_multi_delete.test

  mysql-test/suite/rpl/t/rpl_multi_delete2-slave.opt@1.6, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_multi_delete2-slave.opt -> mysql-test/suite/rpl/t/rpl_multi_delete2-slave.opt

  mysql-test/suite/rpl/t/rpl_multi_delete2.test@1.8, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_multi_delete2.test -> mysql-test/suite/rpl/t/rpl_multi_delete2.test

  mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_multi_engine-slave.opt -> mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt

  mysql-test/suite/rpl/t/rpl_multi_engine.test@1.8, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_multi_engine.test -> mysql-test/suite/rpl/t/rpl_multi_engine.test

  mysql-test/suite/rpl/t/rpl_multi_update.test@1.13, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_multi_update.test -> mysql-test/suite/rpl/t/rpl_multi_update.test

  mysql-test/suite/rpl/t/rpl_multi_update2-slave.opt@1.3, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_multi_update2-slave.opt -> mysql-test/suite/rpl/t/rpl_multi_update2-slave.opt

  mysql-test/suite/rpl/t/rpl_multi_update2.test@1.8.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_multi_update2.test -> mysql-test/suite/rpl/t/rpl_multi_update2.test

  mysql-test/suite/rpl/t/rpl_multi_update3.test@1.8.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_multi_update3.test -> mysql-test/suite/rpl/t/rpl_multi_update3.test

  mysql-test/suite/rpl/t/rpl_multi_update4-slave.opt@1.2, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_multi_update4-slave.opt -> mysql-test/suite/rpl/t/rpl_multi_update4-slave.opt

  mysql-test/suite/rpl/t/rpl_multi_update4.test@1.3, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_multi_update4.test -> mysql-test/suite/rpl/t/rpl_multi_update4.test

  mysql-test/suite/rpl/t/rpl_optimize.test@1.8, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_optimize.test -> mysql-test/suite/rpl/t/rpl_optimize.test

  mysql-test/suite/rpl/t/rpl_packet-master.opt@1.2, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_packet-master.opt -> mysql-test/suite/rpl/t/rpl_packet-master.opt

  mysql-test/suite/rpl/t/rpl_packet-slave.opt@1.2, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_packet-slave.opt -> mysql-test/suite/rpl/t/rpl_packet-slave.opt

  mysql-test/suite/rpl/t/rpl_packet.test@1.8, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_packet.test -> mysql-test/suite/rpl/t/rpl_packet.test

  mysql-test/suite/rpl/t/rpl_ps.test@1.5, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ps.test -> mysql-test/suite/rpl/t/rpl_ps.test

  mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test@1.8.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_rbr_to_sbr.test -> mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test

  mysql-test/suite/rpl/t/rpl_read_only-slave.opt@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_read_only-slave.opt -> mysql-test/suite/rpl/t/rpl_read_only-slave.opt

  mysql-test/suite/rpl/t/rpl_read_only.test@1.4, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_read_only.test -> mysql-test/suite/rpl/t/rpl_read_only.test

  mysql-test/suite/rpl/t/rpl_redirect.test@1.15.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_redirect.test -> mysql-test/suite/rpl/t/rpl_redirect.test

  mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_relay_space_innodb-master.opt -> mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt

  mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt@1.2, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_relay_space_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt

  mysql-test/suite/rpl/t/rpl_relay_space_innodb.test@1.4, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_relay_space_innodb.test -> mysql-test/suite/rpl/t/rpl_relay_space_innodb.test

  mysql-test/suite/rpl/t/rpl_relay_space_myisam.test@1.4, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_relay_space_myisam.test -> mysql-test/suite/rpl/t/rpl_relay_space_myisam.test

  mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt@1.6, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_relayrotate-slave.opt -> mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt

  mysql-test/suite/rpl/t/rpl_relayrotate.test@1.19.1.1, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_relayrotate.test -> mysql-test/suite/rpl/t/rpl_relayrotate.test

  mysql-test/suite/rpl/t/rpl_relayspace-slave.opt@1.6, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_relayspace-slave.opt -> mysql-test/suite/rpl/t/rpl_relayspace-slave.opt

  mysql-test/suite/rpl/t/rpl_relayspace.test@1.6, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_relayspace.test -> mysql-test/suite/rpl/t/rpl_relayspace.test

  mysql-test/suite/rpl/t/rpl_replicate_do-slave.opt@1.7, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_replicate_do-slave.opt -> mysql-test/suite/rpl/t/rpl_replicate_do-slave.opt

  mysql-test/suite/rpl/t/rpl_replicate_do.test@1.30.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_replicate_do.test -> mysql-test/suite/rpl/t/rpl_replicate_do.test

  mysql-test/suite/rpl/t/rpl_replicate_ignore_db-slave.opt@1.2, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_replicate_ignore_db-slave.opt -> mysql-test/suite/rpl/t/rpl_replicate_ignore_db-slave.opt

  mysql-test/suite/rpl/t/rpl_replicate_ignore_db.test@1.2, 2007-06-27 14:27:21+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_replicate_ignore_db.test -> mysql-test/suite/rpl/t/rpl_replicate_ignore_db.test

  mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt@1.7, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_rewrt_db-slave.opt -> mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt

  mysql-test/suite/rpl/t/rpl_rewrt_db.test@1.11, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_rewrt_db.test -> mysql-test/suite/rpl/t/rpl_rewrt_db.test

  mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt@1.6, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_rotate_logs-master.opt -> mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt

  mysql-test/suite/rpl/t/rpl_rotate_logs-slave.sh@1.8, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_rotate_logs-slave.sh -> mysql-test/suite/rpl/t/rpl_rotate_logs-slave.sh

  mysql-test/suite/rpl/t/rpl_rotate_logs.slave-mi@1.9, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_rotate_logs.slave-mi -> mysql-test/suite/rpl/t/rpl_rotate_logs.slave-mi

  mysql-test/suite/rpl/t/rpl_rotate_logs.test@1.72.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_rotate_logs.test -> mysql-test/suite/rpl/t/rpl_rotate_logs.test

  mysql-test/suite/rpl/t/rpl_row_001.test@1.2.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_001.test -> mysql-test/suite/rpl/t/rpl_row_001.test

  mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt@1.2, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_4_bytes-master.opt -> mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt

  mysql-test/suite/rpl/t/rpl_row_4_bytes.test@1.3, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_4_bytes.test -> mysql-test/suite/rpl/t/rpl_row_4_bytes.test

  mysql-test/suite/rpl/t/rpl_row_NOW.test@1.6, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_NOW.test -> mysql-test/suite/rpl/t/rpl_row_NOW.test

  mysql-test/suite/rpl/t/rpl_row_USER.test@1.4, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_USER.test -> mysql-test/suite/rpl/t/rpl_row_USER.test

  mysql-test/suite/rpl/t/rpl_row_UUID.test@1.2.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_UUID.test -> mysql-test/suite/rpl/t/rpl_row_UUID.test

  mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt@1.5, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_basic_11bugs-master.opt -> mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt

  mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt@1.3, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_basic_11bugs-slave.opt -> mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt

  mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test@1.15.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_basic_11bugs.test -> mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test

  mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test@1.2.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_basic_2myisam.test -> mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test

  mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt@1.2, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_basic_3innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt

  mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test@1.2.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_basic_3innodb.test -> mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test

  mysql-test/suite/rpl/t/rpl_row_basic_8partition.test@1.7, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_basic_8partition.test -> mysql-test/suite/rpl/t/rpl_row_basic_8partition.test

  mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt@1.2, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_blob_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt

  mysql-test/suite/rpl/t/rpl_row_blob_innodb.test@1.3.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_blob_innodb.test -> mysql-test/suite/rpl/t/rpl_row_blob_innodb.test

  mysql-test/suite/rpl/t/rpl_row_blob_myisam.test@1.2.1.1, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_blob_myisam.test -> mysql-test/suite/rpl/t/rpl_row_blob_myisam.test

  mysql-test/suite/rpl/t/rpl_row_charset.test@1.2.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_charset.test -> mysql-test/suite/rpl/t/rpl_row_charset.test

  mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt@1.3, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_create_table-slave.opt -> mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt

  mysql-test/suite/rpl/t/rpl_row_create_table.test@1.14, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_create_table.test -> mysql-test/suite/rpl/t/rpl_row_create_table.test

  mysql-test/suite/rpl/t/rpl_row_delayed_ins.test@1.3, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_delayed_ins.test -> mysql-test/suite/rpl/t/rpl_row_delayed_ins.test

  mysql-test/suite/rpl/t/rpl_row_drop.test@1.4, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_drop.test -> mysql-test/suite/rpl/t/rpl_row_drop.test

  mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt@1.2, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_err_daisychain-master.opt -> mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt

  mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt@1.2, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_err_daisychain-slave.opt -> mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt

  mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test@1.6, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_flsh_tbls.test -> mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test

  mysql-test/suite/rpl/t/rpl_row_func001.test@1.3, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_func001.test -> mysql-test/suite/rpl/t/rpl_row_func001.test

  mysql-test/suite/rpl/t/rpl_row_func002.test@1.6, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_func002.test -> mysql-test/suite/rpl/t/rpl_row_func002.test

  mysql-test/suite/rpl/t/rpl_row_func003-slave.opt@1.3, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_func003-slave.opt -> mysql-test/suite/rpl/t/rpl_row_func003-slave.opt

  mysql-test/suite/rpl/t/rpl_row_func003.test@1.2.1.1, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_func003.test -> mysql-test/suite/rpl/t/rpl_row_func003.test

  mysql-test/suite/rpl/t/rpl_row_inexist_tbl-slave.opt@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_inexist_tbl-slave.opt -> mysql-test/suite/rpl/t/rpl_row_inexist_tbl-slave.opt

  mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test@1.2.1.2, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_inexist_tbl.test -> mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test

  mysql-test/suite/rpl/t/rpl_row_insert_delayed.test@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_insert_delayed.test -> mysql-test/suite/rpl/t/rpl_row_insert_delayed.test

  mysql-test/suite/rpl/t/rpl_row_log-master.opt@1.2, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_log-master.opt -> mysql-test/suite/rpl/t/rpl_row_log-master.opt

  mysql-test/suite/rpl/t/rpl_row_log-slave.opt@1.2, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_log-slave.opt -> mysql-test/suite/rpl/t/rpl_row_log-slave.opt

  mysql-test/suite/rpl/t/rpl_row_log.test@1.2.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_log.test -> mysql-test/suite/rpl/t/rpl_row_log.test

  mysql-test/suite/rpl/t/rpl_row_log_innodb-master.opt@1.2, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_log_innodb-master.opt -> mysql-test/suite/rpl/t/rpl_row_log_innodb-master.opt

  mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_log_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt

  mysql-test/suite/rpl/t/rpl_row_log_innodb.test@1.2.1.1, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_log_innodb.test -> mysql-test/suite/rpl/t/rpl_row_log_innodb.test

  mysql-test/suite/rpl/t/rpl_row_max_relay_size.test@1.5, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_max_relay_size.test -> mysql-test/suite/rpl/t/rpl_row_max_relay_size.test

  mysql-test/suite/rpl/t/rpl_row_mysqlbinlog-master.opt@1.2, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_mysqlbinlog-master.opt -> mysql-test/suite/rpl/t/rpl_row_mysqlbinlog-master.opt

  mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test@1.7, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_mysqlbinlog.test -> mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test

  mysql-test/suite/rpl/t/rpl_row_mystery22.test@1.2, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_mystery22.test -> mysql-test/suite/rpl/t/rpl_row_mystery22.test

  mysql-test/suite/rpl/t/rpl_row_reset_slave.test@1.2, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_reset_slave.test -> mysql-test/suite/rpl/t/rpl_row_reset_slave.test

  mysql-test/suite/rpl/t/rpl_row_sp001.test@1.7, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp001.test -> mysql-test/suite/rpl/t/rpl_row_sp001.test

  mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt@1.2, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp002_innodb-master.opt -> mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt

  mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt@1.2, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp002_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt

  mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test@1.3, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp002_innodb.test -> mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test

  mysql-test/suite/rpl/t/rpl_row_sp003-master.opt@1.3, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp003-master.opt -> mysql-test/suite/rpl/t/rpl_row_sp003-master.opt

  mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt@1.3, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp003-slave.opt -> mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt

  mysql-test/suite/rpl/t/rpl_row_sp003.test@1.2.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp003.test -> mysql-test/suite/rpl/t/rpl_row_sp003.test

  mysql-test/suite/rpl/t/rpl_row_sp005.test@1.4, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp005.test -> mysql-test/suite/rpl/t/rpl_row_sp005.test

  mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp006_InnoDB-slave.opt -> mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt

  mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test@1.2.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp006_InnoDB.test -> mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test

  mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt@1.2, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp007_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt

  mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test@1.3, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp007_innodb.test -> mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test

  mysql-test/suite/rpl/t/rpl_row_sp008.test@1.6, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp008.test -> mysql-test/suite/rpl/t/rpl_row_sp008.test

  mysql-test/suite/rpl/t/rpl_row_sp009.test@1.4, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp009.test -> mysql-test/suite/rpl/t/rpl_row_sp009.test

  mysql-test/suite/rpl/t/rpl_row_sp010.test@1.4, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp010.test -> mysql-test/suite/rpl/t/rpl_row_sp010.test

  mysql-test/suite/rpl/t/rpl_row_sp011.test@1.6, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp011.test -> mysql-test/suite/rpl/t/rpl_row_sp011.test

  mysql-test/suite/rpl/t/rpl_row_sp012.test@1.4, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_sp012.test -> mysql-test/suite/rpl/t/rpl_row_sp012.test

  mysql-test/suite/rpl/t/rpl_row_stop_middle.test@1.3, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_stop_middle.test -> mysql-test/suite/rpl/t/rpl_row_stop_middle.test

  mysql-test/suite/rpl/t/rpl_row_stop_middle_update-master.opt@1.2, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_stop_middle_update-master.opt -> mysql-test/suite/rpl/t/rpl_row_stop_middle_update-master.opt

  mysql-test/suite/rpl/t/rpl_row_stop_middle_update-slave.opt@1.2, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_stop_middle_update-slave.opt -> mysql-test/suite/rpl/t/rpl_row_stop_middle_update-slave.opt

  mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test@1.3, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_stop_middle_update.test -> mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test

  mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test@1.3, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_tabledefs_2myisam.test -> mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test

  mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt@1.2, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_tabledefs_3innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt

  mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test@1.2, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_tabledefs_3innodb.test -> mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test

  mysql-test/suite/rpl/t/rpl_row_trig001.test@1.6, 2007-06-27 14:27:21+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_trig001.test -> mysql-test/suite/rpl/t/rpl_row_trig001.test

  mysql-test/suite/rpl/t/rpl_row_trig002.test@1.4, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_trig002.test -> mysql-test/suite/rpl/t/rpl_row_trig002.test

  mysql-test/suite/rpl/t/rpl_row_trig003.test@1.4, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_trig003.test -> mysql-test/suite/rpl/t/rpl_row_trig003.test

  mysql-test/suite/rpl/t/rpl_row_trig004.test@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_trig004.test -> mysql-test/suite/rpl/t/rpl_row_trig004.test

  mysql-test/suite/rpl/t/rpl_row_until.test@1.3.2.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_until.test -> mysql-test/suite/rpl/t/rpl_row_until.test

  mysql-test/suite/rpl/t/rpl_row_view01.test@1.4, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_view01.test -> mysql-test/suite/rpl/t/rpl_row_view01.test

  mysql-test/suite/rpl/t/rpl_server_id1.test@1.8.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_server_id1.test -> mysql-test/suite/rpl/t/rpl_server_id1.test

  mysql-test/suite/rpl/t/rpl_server_id2-slave.opt@1.3, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_server_id2-slave.opt -> mysql-test/suite/rpl/t/rpl_server_id2-slave.opt

  mysql-test/suite/rpl/t/rpl_server_id2.test@1.9.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_server_id2.test -> mysql-test/suite/rpl/t/rpl_server_id2.test

  mysql-test/suite/rpl/t/rpl_session_var.test@1.6, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_session_var.test -> mysql-test/suite/rpl/t/rpl_session_var.test

  mysql-test/suite/rpl/t/rpl_set_charset.test@1.8, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_set_charset.test -> mysql-test/suite/rpl/t/rpl_set_charset.test

  mysql-test/suite/rpl/t/rpl_sf.test@1.3, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_sf.test -> mysql-test/suite/rpl/t/rpl_sf.test

  mysql-test/suite/rpl/t/rpl_skip_error-slave.opt@1.7, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_skip_error-slave.opt -> mysql-test/suite/rpl/t/rpl_skip_error-slave.opt

  mysql-test/suite/rpl/t/rpl_skip_error.test@1.9.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_skip_error.test -> mysql-test/suite/rpl/t/rpl_skip_error.test

  mysql-test/suite/rpl/t/rpl_slave_status.test@1.10.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_slave_status.test -> mysql-test/suite/rpl/t/rpl_slave_status.test

  mysql-test/suite/rpl/t/rpl_sp-master.opt@1.4, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_sp-master.opt -> mysql-test/suite/rpl/t/rpl_sp-master.opt

  mysql-test/suite/rpl/t/rpl_sp-slave.opt@1.6, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_sp-slave.opt -> mysql-test/suite/rpl/t/rpl_sp-slave.opt

  mysql-test/suite/rpl/t/rpl_sp.test@1.34, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_sp.test -> mysql-test/suite/rpl/t/rpl_sp.test

  mysql-test/suite/rpl/t/rpl_sp004.test@1.6, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_sp004.test -> mysql-test/suite/rpl/t/rpl_sp004.test

  mysql-test/suite/rpl/t/rpl_sp_effects-master.opt@1.2, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_sp_effects-master.opt -> mysql-test/suite/rpl/t/rpl_sp_effects-master.opt

  mysql-test/suite/rpl/t/rpl_sp_effects-slave.opt@1.2, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_sp_effects-slave.opt -> mysql-test/suite/rpl/t/rpl_sp_effects-slave.opt

  mysql-test/suite/rpl/t/rpl_sp_effects.test@1.9, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_sp_effects.test -> mysql-test/suite/rpl/t/rpl_sp_effects.test

  mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt@1.3, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_sporadic_master-master.opt -> mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt

  mysql-test/suite/rpl/t/rpl_sporadic_master.test@1.12, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_sporadic_master.test -> mysql-test/suite/rpl/t/rpl_sporadic_master.test

  mysql-test/suite/rpl/t/rpl_ssl.test@1.6.1.2, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ssl.test -> mysql-test/suite/rpl/t/rpl_ssl.test

  mysql-test/suite/rpl/t/rpl_ssl1.test@1.27.1.1, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ssl1.test -> mysql-test/suite/rpl/t/rpl_ssl1.test

  mysql-test/suite/rpl/t/rpl_start_stop_slave.test@1.5, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_start_stop_slave.test -> mysql-test/suite/rpl/t/rpl_start_stop_slave.test

  mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt@1.5, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_stm_000001-slave.opt -> mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt

  mysql-test/suite/rpl/t/rpl_stm_000001.test@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_stm_000001.test -> mysql-test/suite/rpl/t/rpl_stm_000001.test

  mysql-test/suite/rpl/t/rpl_stm_EE_err2.test@1.3, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_stm_EE_err2.test -> mysql-test/suite/rpl/t/rpl_stm_EE_err2.test

  mysql-test/suite/rpl/t/rpl_stm_charset.test@1.2, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_stm_charset.test -> mysql-test/suite/rpl/t/rpl_stm_charset.test

  mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test@1.5, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_stm_flsh_tbls.test -> mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test

  mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test@1.2, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_stm_insert_delayed.test -> mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test

  mysql-test/suite/rpl/t/rpl_stm_log-master.opt@1.7, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_stm_log-master.opt -> mysql-test/suite/rpl/t/rpl_stm_log-master.opt

  mysql-test/suite/rpl/t/rpl_stm_log-slave.opt@1.5, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_stm_log-slave.opt -> mysql-test/suite/rpl/t/rpl_stm_log-slave.opt

  mysql-test/suite/rpl/t/rpl_stm_log.test@1.3.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_stm_log.test -> mysql-test/suite/rpl/t/rpl_stm_log.test

  mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test@1.3, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_stm_max_relay_size.test -> mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test

  mysql-test/suite/rpl/t/rpl_stm_multi_query.test@1.3, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_stm_multi_query.test -> mysql-test/suite/rpl/t/rpl_stm_multi_query.test

  mysql-test/suite/rpl/t/rpl_stm_mystery22.test@1.11, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_stm_mystery22.test -> mysql-test/suite/rpl/t/rpl_stm_mystery22.test

  mysql-test/suite/rpl/t/rpl_stm_no_op.test@1.4, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_stm_no_op.test -> mysql-test/suite/rpl/t/rpl_stm_no_op.test

  mysql-test/suite/rpl/t/rpl_stm_reset_slave.test@1.3, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_stm_reset_slave.test -> mysql-test/suite/rpl/t/rpl_stm_reset_slave.test

  mysql-test/suite/rpl/t/rpl_stm_until.test@1.25.2.1, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_stm_until.test -> mysql-test/suite/rpl/t/rpl_stm_until.test

  mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test@1.18, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_switch_stm_row_mixed.test -> mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test

  mysql-test/suite/rpl/t/rpl_temp_table.test@1.22, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_temp_table.test -> mysql-test/suite/rpl/t/rpl_temp_table.test

  mysql-test/suite/rpl/t/rpl_temporary.test@1.32, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_temporary.test -> mysql-test/suite/rpl/t/rpl_temporary.test

  mysql-test/suite/rpl/t/rpl_timezone-master.opt@1.4, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_timezone-master.opt -> mysql-test/suite/rpl/t/rpl_timezone-master.opt

  mysql-test/suite/rpl/t/rpl_timezone-slave.opt@1.5, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_timezone-slave.opt -> mysql-test/suite/rpl/t/rpl_timezone-slave.opt

  mysql-test/suite/rpl/t/rpl_timezone.test@1.16, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_timezone.test -> mysql-test/suite/rpl/t/rpl_timezone.test

  mysql-test/suite/rpl/t/rpl_trigger.test@1.13, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_trigger.test -> mysql-test/suite/rpl/t/rpl_trigger.test

  mysql-test/suite/rpl/t/rpl_trunc_temp.test@1.6, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_trunc_temp.test -> mysql-test/suite/rpl/t/rpl_trunc_temp.test

  mysql-test/suite/rpl/t/rpl_truncate_2myisam.test@1.3, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_truncate_2myisam.test -> mysql-test/suite/rpl/t/rpl_truncate_2myisam.test

  mysql-test/suite/rpl/t/rpl_truncate_3innodb.test@1.3, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_truncate_3innodb.test -> mysql-test/suite/rpl/t/rpl_truncate_3innodb.test

  mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt@1.2, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_truncate_7ndb_2-master.opt -> mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt

  mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test@1.2, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_truncate_7ndb_2.test -> mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test

  mysql-test/suite/rpl/t/rpl_udf-master.opt@1.2, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_udf-master.opt -> mysql-test/suite/rpl/t/rpl_udf-master.opt

  mysql-test/suite/rpl/t/rpl_udf-slave.opt@1.2, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_udf-slave.opt -> mysql-test/suite/rpl/t/rpl_udf-slave.opt

  mysql-test/suite/rpl/t/rpl_udf.test@1.2, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_udf.test -> mysql-test/suite/rpl/t/rpl_udf.test

  mysql-test/suite/rpl/t/rpl_user_variables.test@1.25, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_user_variables.test -> mysql-test/suite/rpl/t/rpl_user_variables.test

  mysql-test/suite/rpl/t/rpl_variables-master.opt@1.2, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_variables-master.opt -> mysql-test/suite/rpl/t/rpl_variables-master.opt

  mysql-test/suite/rpl/t/rpl_variables.test@1.7, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_variables.test -> mysql-test/suite/rpl/t/rpl_variables.test

  mysql-test/suite/rpl/t/rpl_view-slave.opt@1.4, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_view-slave.opt -> mysql-test/suite/rpl/t/rpl_view-slave.opt

  mysql-test/suite/rpl/t/rpl_view.test@1.11, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_view.test -> mysql-test/suite/rpl/t/rpl_view.test

  mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result@1.3, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_2innodb.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result@1.4, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_2myisam.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result@1.5.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_UUID.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result@1.4, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_auto_inc.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_bank.result@1.5, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_bank.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_bank.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result@1.11.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_basic.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result@1.8, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_blob.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result@1.3, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_blob2.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result@1.9, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_charset.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result@1.1.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_circular.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result@1.6, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_circular_simplex.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result@1.2, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_commit_afterflush.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result@1.10.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_dd_advance.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result@1.10.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_dd_basic.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result@1.2, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_dd_partitions.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result@1.4, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_ddl.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result@1.2, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_delete_nowhere.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result@1.3, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_do_db.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result@1.4, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_do_table.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@1.4.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_extraCol.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result@1.3, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_func003.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result@1.6.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_idempotent.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_innodb_trans.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result@1.4, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_insert_ignore.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_load.result@1.2, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_load.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_load.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result@1.25.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_log.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result@1.8, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_multi.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result@1.3, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_multi_update2.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result@1.5, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_multi_update3.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result@1.3, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_relayrotate.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result@1.3, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_rep_ignore.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result@1.4, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_row_001.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result@1.3, 2007-06-27 14:27:21+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_sp003.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result@1.4, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_sp006.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result@1.1.2.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_stm_innodb.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result@1.11.1.1, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_sync.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result

  mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndb_trig004.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result

  mysql-test/suite/rpl_ndb/r/rpl_ndbapi_multi.result@1.3, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_ndbapi_multi.result -> mysql-test/suite/rpl_ndb/r/rpl_ndbapi_multi.result

  mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result@1.5, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_row_basic_7ndb.result -> mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result

  mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result@1.10.1.1, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/rpl_truncate_7ndb.result -> mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result

  mysql-test/suite/rpl_ndb/t/disabled.def@1.1, 2007-06-27 14:27:58+02:00, msvensson@pilot.(none) +27 -0
    New BitKeeper file ``mysql-test/suite/rpl_ndb/t/disabled.def''

  mysql-test/suite/rpl_ndb/t/disabled.def@1.0, 2007-06-27 14:27:58+02:00, msvensson@pilot.(none) +0 -0

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt@1.3, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_2innodb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt@1.3, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_2innodb-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test@1.1.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_2innodb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt@1.3, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_2myisam-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt@1.3, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_2myisam-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test@1.1.1.1, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_2myisam.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test@1.1.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_UUID.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test@1.4.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_auto_inc.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test@1.9.2.1, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_bank.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test@1.11.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_basic.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test@1.4.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_blob.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test@1.1.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_blob2.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test@1.1.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_charset.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test@1.1.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_circular.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test@1.4.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_circular_simplex.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test@1.3.2.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_commit_afterflush.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test@1.11.2.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_dd_advance.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test@1.6.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_dd_basic.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test@1.1.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_dd_partitions.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test@1.5.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_ddl.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test@1.3.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_delete_nowhere.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db-slave.opt@1.2, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_do_db-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db-slave.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test@1.2.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_do_db.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table-slave.opt@1.2, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_do_table-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table-slave.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test@1.4.1.1, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_do_table.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test@1.1.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_extraCol.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test@1.2.1.1, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_func003.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test@1.6.2.1, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_idempotent.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-master.opt@1.3, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_innodb2ndb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-master.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt@1.6, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_innodb2ndb-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test@1.1.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_innodb2ndb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans-slave.opt@1.2, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_innodb_trans-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans-slave.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test@1.1.2.1, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_innodb_trans.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test@1.3.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_insert_ignore.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test@1.1.1.1, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_load.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_log-master.opt@1.2, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_log-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_log-master.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test@1.1.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_log.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test@1.4.1.1, 2007-06-27 14:27:23+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_multi.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2-slave.opt@1.2, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_multi_update2-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2-slave.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test@1.2.1.1, 2007-06-27 14:27:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_multi_update2.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test@1.2.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_multi_update3.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-master.opt@1.2, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_myisam2ndb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-master.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt@1.6, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_myisam2ndb-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test@1.1.1.1, 2007-06-27 14:27:29+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_myisam2ndb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt@1.3, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_relayrotate-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test@1.1.1.1, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_relayrotate.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore-slave.opt@1.2, 2007-06-27 14:27:28+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_rep_ignore-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore-slave.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test@1.2.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_rep_ignore.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test@1.1.1.1, 2007-06-27 14:27:33+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_row_001.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test@1.1.1.1, 2007-06-27 14:27:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_sp003.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test@1.2.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_sp006.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt@1.1.1.1, 2007-06-27 14:27:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_stm_innodb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test@1.1.3.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_stm_innodb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test@1.11.2.1, 2007-06-27 14:27:22+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_sync.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test@1.1.1.1, 2007-06-27 14:27:24+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndb_trig004.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test

  mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test@1.2.1.1, 2007-06-27 14:27:30+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_ndbapi_multi.test -> mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test

  mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test@1.3.1.1, 2007-06-27 14:27:31+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_row_basic_7ndb.test -> mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test

  mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test@1.7.1.1, 2007-06-27 14:27:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/rpl_truncate_7ndb.test -> mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test

  mysql-test/t/disabled.def@1.262.2.1, 2007-06-27 14:27:58+02:00, msvensson@pilot.(none) +0 -23
    Move disabled testcases to their respective suite

ChangeSet@1.1810.3105.6, 2007-06-27 14:04:29+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug#24924: shared-memory-base-name that is too long causes buffer overflow
  
  show that shm communication still works on windows,
  and that we can't overflow the base-name.

  mysql-test/r/windows_shm.result@1.1, 2007-06-27 14:04:28+02:00, tnurnberg@sin.intern.azundris.com +2 -0
    Bug#24924: shared-memory-base-name that is too long causes buffer overflow
    
    show that shm communication still works on windows,
    and that we can't overflow the base-name.

  mysql-test/r/windows_shm.result@1.0, 2007-06-27 14:04:28+02:00, tnurnberg@sin.intern.azundris.com +0 -0

  mysql-test/t/windows_shm-master.opt@1.1, 2007-06-27 14:04:28+02:00, tnurnberg@sin.intern.azundris.com +1 -0
    Bug#24924: shared-memory-base-name that is too long causes buffer overflow
    
    start a server with shm communication if we're on
    windows.

  mysql-test/t/windows_shm-master.opt@1.0, 2007-06-27 14:04:28+02:00, tnurnberg@sin.intern.azundris.com +0 -0

  mysql-test/t/windows_shm.test@1.1, 2007-06-27 14:04:28+02:00, tnurnberg@sin.intern.azundris.com +9 -0
    Bug#24924: shared-memory-base-name that is too long causes buffer overflow
    
    .opt has started a server with shm communication
    if we're on windows. now start a client with shm
    and connect to that server.
    

  mysql-test/t/windows_shm.test@1.0, 2007-06-27 14:04:28+02:00, tnurnberg@sin.intern.azundris.com +0 -0

ChangeSet@1.1810.2897.43, 2007-06-27 14:35:49+03:00, gkodinov@magare.gmz +4 -0
  Bug #26642: create index corrupts table definition in .frm
    
    Thanks to Martin Friebe for finding and submitting a fix for this bug!
    
    A table with maximum number of key segments and maximum length key name
    would have a corrupted .frm file, due to an incorrect calculation of the
    complete key length.  Now the key length is computed correctly (I hope) :-)
    
    MyISAM would reject a table with the maximum number of keys and the maximum
    number of key segments in all keys.  It would allow one less than this total
    maximum.  Now MyISAM accepts a table defined with the maximum.  (This is a
    very minor issue.)

  mysql-test/r/create.result@1.107.1.22, 2007-06-27 14:35:48+03:00, gkodinov@magare.gmz +638 -0
    Bug #26642: test case

  mysql-test/t/create.test@1.71.1.17, 2007-06-27 14:35:48+03:00, gkodinov@magare.gmz +333 -0
    Bug #26642: test case

  sql/table.cc@1.160.1.92, 2007-06-27 14:35:48+03:00, gkodinov@magare.gmz +13 -1
    Bug #26642: In create_frm(), fix formula for key_length; 
    it was too small by (keys * 2) bytes

  myisam/mi_open.c@1.90.25.1, 2007-06-27 14:35:48+03:00, gkodinov@magare.gmz +1 -1
    Bug #26642: change >= to > in a comparison (i.e., error 
    only if key_parts_in_table really is greater than 
    MAX_KEY * MAX_KEY_SEG)

ChangeSet@1.2495.26.1, 2007-06-27 13:32:25+02:00, tomas@host-72.homerun.telia.com +69 -0
  WL#3303
  - undoing disable of ndb tests

  mysql-test/t/binlog_multi_engine.test@1.8, 2007-06-27 13:32:12+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/loaddata_autocom_ndb.test@1.4, 2007-06-27 13:32:12+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_alter_table.test@1.39, 2007-06-27 13:32:12+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_alter_table2.test@1.5, 2007-06-27 13:32:12+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_alter_table3.test@1.12, 2007-06-27 13:32:12+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_autodiscover.test@1.27, 2007-06-27 13:32:12+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_autodiscover2.test@1.11, 2007-06-27 13:32:12+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_autodiscover3.test@1.13, 2007-06-27 13:32:12+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_basic.test@1.61, 2007-06-27 13:32:12+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_binlog_log_bin.test@1.4, 2007-06-27 13:32:12+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_binlog_multi.test@1.10, 2007-06-27 13:32:12+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_bitfield.test@1.8, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_blob.test@1.22, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_blob_partition.test@1.5, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_cache.test@1.8, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_cache2.test@1.7, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_cache_multi.test@1.6, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_cache_multi2.test@1.8, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_charset.test@1.16, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_condition_pushdown.test@1.25, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_config.test@1.16, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_config2.test@1.3, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_cursor.test@1.4, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_database.test@1.5, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_dd_alter.test@1.7, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_dd_backuprestore.test@1.10, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_dd_basic.test@1.14, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_dd_ddl.test@1.14, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_dd_disk2memory.test@1.6, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_dd_dump.test@1.7, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_dd_sql_features.test@1.5, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_gis.test@1.8, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_index.test@1.7, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_index_ordered.test@1.36, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_index_unique.test@1.31, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_insert.test@1.18, 2007-06-27 13:32:13+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_limit.test@1.6, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_loaddatalocal.test@1.4, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_lock.test@1.20, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_minmax.test@1.6, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_multi.test@1.20, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_partition_error.test@1.4, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_partition_key.test@1.5, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_partition_list.test@1.4, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_partition_range.test@1.4, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_read_multi_range.test@1.18, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_rename.test@1.3, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_replace.test@1.11, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_restore.test@1.29, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_restore_partition.test@1.3, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_restore_print.test@1.5, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_row_format.test@1.4, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_single_user.test@1.9, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_sp.test@1.4, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_subquery.test@1.9, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_temporary.test@1.3, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_transaction.test@1.8, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_trigger.test@1.6, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_truncate.test@1.6, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_types.test@1.9, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_update.test@1.13, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndb_view.test@1.3, 2007-06-27 13:32:14+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ndbapi.test@1.4, 2007-06-27 13:32:15+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/ps_7ndb.test@1.8, 2007-06-27 13:32:15+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/strict_autoinc_5ndb.test@1.3, 2007-06-27 13:32:15+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/r/rpl_ndb_stm_innodb.result@1.3, 2007-06-27 13:32:12+02:00, tomas@host-72.homerun.telia.com +0 -3
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/rpl_ndb_commit_afterflush.test@1.6, 2007-06-27 13:32:15+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/rpl_ndb_innodb_trans.test@1.4, 2007-06-27 13:32:15+02:00, tomas@host-72.homerun.telia.com +0 -1
    WL#3303
    - undoing disable of ndb tests

  mysql-test/t/rpl_ndb_stm_innodb.test@1.4, 2007-06-27 13:32:15+02:00, tomas@host-72.homerun.telia.com +0 -8
    WL#3303
    - undoing disable of ndb tests

ChangeSet@1.2514.5.1, 2007-06-27 13:23:58+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  windows fixies

  sql/log.cc@1.282.1.8, 2007-06-27 13:23:52+02:00, tnurnberg@sin.intern.azundris.com +1 -1
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    windows fixies

ChangeSet@1.2514.3.7, 2007-06-27 16:20:00+05:00, ramil@mysql.com +3 -0
  Fix for bug #29353: inserting a negative value to a csv table leads to the table corruption
  
  Problem: we believe a number cannot start with '-' ['+'] sign reading rows.
  
  Fix: let field->store() check given values.

  mysql-test/r/csv.result@1.18.1.2, 2007-06-27 16:19:58+05:00, ramil@mysql.com +31 -0
    Fix for bug #29353: inserting a negative value to a csv table leads to the table corruption
      - test result.

  mysql-test/t/csv.test@1.23.1.2, 2007-06-27 16:19:58+05:00, ramil@mysql.com +25 -0
    Fix for bug #29353: inserting a negative value to a csv table leads to the table corruption
      - test case.

  storage/csv/ha_tina.cc@1.77.1.2, 2007-06-27 16:19:58+05:00, ramil@mysql.com +36 -34
    Fix for bug #29353: inserting a negative value to a csv table leads to the table corruption
      - code optimization: removed unnecessary file_buff->get_value() calls.
      - let field->store() check given value correctness.

ChangeSet@1.1810.3105.5, 2007-06-27 13:19:28+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  Windows fixies

  sql/log.cc@1.158.1.56, 2007-06-27 13:19:25+02:00, tnurnberg@sin.intern.azundris.com +1 -1
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    Windows fixies

ChangeSet@1.2482.8.42, 2007-06-27 11:31:07+02:00, tomas@host-72.homerun.telia.com +2 -0
  correct include file

  mysql-test/t/rpl_ndb_mix_innodb.test@1.2, 2007-06-27 11:30:56+02:00, tomas@host-72.homerun.telia.com +1 -1
    correct include file

  mysql-test/t/rpl_ndb_stm_innodb.test@1.1.1.3, 2007-06-27 11:30:57+02:00, tomas@host-72.homerun.telia.com +1 -1
    correct include file

ChangeSet@1.1810.3095.2, 2007-06-27 13:19:34+05:00, svoj@mysql.com +3 -0
  BUG#29207 - archive table reported as corrupt by check table (P1)
  
  CHECK TABLE against ARCHIVE table may falsely report table corruption,
  or cause server crash.
  
  Fixed by using proper buffer for CHECK TABLE.
  
  Affects both 5.0 and 5.1.

  mysql-test/r/archive.result@1.13.1.5, 2007-06-27 13:19:32+05:00, svoj@mysql.com +7 -0
    A test case for BUG#28916.

  mysql-test/t/archive.test@1.14.1.5, 2007-06-27 13:19:32+05:00, svoj@mysql.com +9 -0
    A test case for BUG#28916.

  sql/ha_archive.cc@1.60.19.1, 2007-06-27 13:19:32+05:00, svoj@mysql.com +3 -16
    We call Field::get_length() from get_row(). Field::get_length() assumes
    that the row was read into table->record[0] buffer, which is not the
    case when we check a table. As a result we get wrongly initialized
    blob length.
    
    Use table->record[0] as record buffer for check table instead.

ChangeSet@1.2514.4.1, 2007-06-27 09:31:47+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  windows fixies

  sql/log.cc@1.282.1.6, 2007-06-27 09:31:45+02:00, tnurnberg@sin.intern.azundris.com +1 -1
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    windows fixies

ChangeSet@1.1810.3106.1, 2007-06-27 09:30:29+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  windows fixies

  sql/log.cc@1.158.1.55, 2007-06-27 09:30:27+02:00, tnurnberg@sin.intern.azundris.com +1 -1
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    windows fixies

ChangeSet@1.2514.3.1, 2007-06-27 08:18:24+02:00, tnurnberg@sin.intern.azundris.com +2 -0
  Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
  into  mysql.com:/home/ram/work/b29079/b29079.5.0
  ---
  Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  fix binlog-writing so that end_log_pos is given correctly even
  within transactions for both SHOW BINLOG and SHOW MASTER STATUS,
  that is as absolute values (from log start) rather than relative
  values (from transaction's start).
  ---
  Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
  into  sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
  ---
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  end_log_pos data within a transaction are relative to
  the start of the transaction rather than absolute.
  we fix those groups in situ before writing the log out.
  
  additional comments and handling for groups with very
  large single events, as suggested by Guilhem.
  ---
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
  into  amd64.(none):/src/bug24732/my50-bug24732
  ---
  Merge maint1.mysql.com:/data/localhome/tsmith/bk/50
  into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
  ---
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
   
  end_log_pos data within a transaction are relative to
  the start of the transaction rather than absolute.
  we fix those groups in situ before writing the log out.
   
  additional comments and handling for groups with very
  large single events, as suggested by Guilhem.
  ---
  Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
  into  sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
  ---
  Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
  into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
  ---
  Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
  into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540

  mysql-test/r/rpl_truncate_7ndb.result@1.11, 2007-06-27 08:18:23+02:00, tnurnberg@sin.intern.azundris.com +20 -20
    Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    fix output for SHOW BINLOG EVENTS so that end_log_pos is given correctly
    even within transactions. do this by rewriting the commit-buffer in place.
    ---
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    end_log_pos data within a transaction are relative to
    the start of the transaction rather than absolute.
    we fix those groups in situ before writing the log out.
    
    additional comments and handling for groups with very
    large single events, as suggested by Guilhem.
    ---
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
     
    end_log_pos data within a transaction are relative to
    the start of the transaction rather than absolute.
    we fix those groups in situ before writing the log out.
     
    additional comments and handling for groups with very
    large single events, as suggested by Guilhem.
    ---
    manual merge

  sql/log.cc@1.282.1.5, 2007-06-27 08:18:23+02:00, tnurnberg@sin.intern.azundris.com +74 -28
    Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    show that output for SHOW BINLOG EVENTS is no correct
    even within transactions.

ChangeSet@1.2513.2.1, 2007-06-27 11:06:37+05:00, holyfoot@mysql.com +3 -0
  Bug #29156 events crash server in test suite
  
  don't free thd->lex->sphead if we didn't do lex_start(),
  as we can have garbage there

  mysql-test/r/events_bugs.result@1.33.1.1, 2007-06-27 11:06:35+05:00, holyfoot@mysql.com +47 -0
    Bug #29156 events crash server in test suite
    
    test result added

  mysql-test/t/events_bugs.test@1.31, 2007-06-27 11:06:35+05:00, holyfoot@mysql.com +57 -0
    Bug #29156 events crash server in test suite
    
    testcase

  sql/event_data_objects.cc@1.106, 2007-06-27 11:06:36+05:00, holyfoot@mysql.com +10 -8
    Bug #29156 events crash server in test suite
    
    don't free thd->lex->sphead if we didn't do lex_start(),
    as we can have garbage there

ChangeSet@1.2514.1.3, 2007-06-27 09:58:58+05:00, holyfoot@mysql.com +2 -0
  rpl_partition.test fixed

  mysql-test/r/rpl_partition.result@1.2, 2007-06-27 09:58:56+05:00, holyfoot@mysql.com +10 -10
    result fixed

  mysql-test/t/rpl_partition.test@1.2, 2007-06-27 09:58:56+05:00, holyfoot@mysql.com +2 -0
    machine-depending lines hidden in result

ChangeSet@1.2514.2.2, 2007-06-26 21:10:51-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #29307  	status.test fails with different Table_locks_immediate
  
  Instead of sleeping for a fixed period of time, we wait until the other query is executing.

  mysql-test/t/status.test@1.22, 2007-06-26 21:10:46-04:00, dkatz@damien-katzs-computer.local +4 -1
    Bug #29307  	status.test fails with different Table_locks_immediate
    
    Instead of sleeping for a fixed period of time, we wait until the other query is executing.

ChangeSet@1.1810.3104.1, 2007-06-26 20:33:53-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #29307  	status.test fails with different Table_locks_immediate
  
  Added more sleep time befoe reap to allow query to be executed.

  mysql-test/t/status.test@1.15.1.4, 2007-06-26 20:33:50-04:00, dkatz@damien-katzs-computer.local +1 -1
    Added more sleep time befoe reap to allow query to be executed.

ChangeSet@1.1616.3072.1, 2007-06-27 03:41:50+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #29251.
  Sometimes special 0 ENUM values was ALTERed to normal
  empty string ENUM values.
  
  Special 0 ENUM value has the same string representation
  as normal ENUM value defined as '' (empty string).
  The do_field_string function was used to convert
  ENUM data at an ALTER TABLE request, but this
  function doesn't care about numerical "indices" of
  ENUM values, i.e. do_field_string doesn't distinguish
  a special 0 value from an empty string value.
  
  A new copy function called do_field_enum has been added to
  copy special 0 ENUM values without conversion to an empty
  string.

  mysql-test/r/type_enum.result@1.24.1.4, 2007-06-27 03:41:47+05:00, gshchepa@gleb.loc +23 -0
    Updated test case for bug #29251.

  mysql-test/t/type_enum.test@1.16.3.1, 2007-06-27 03:41:46+05:00, gshchepa@gleb.loc +17 -0
    Updated test case for bug #29251.

  sql/field_conv.cc@1.33.1.7, 2007-06-27 03:41:45+05:00, gshchepa@gleb.loc +16 -1
    Fixed bug #29251.
    The Copy_field::get_copy_func method has been modified to
    return a pointer to the do_field_enum function if a conversion
    between two columns of incompatible enum types is required.
    The do_field_enum function has been added for the correct
    conversion of special 0 enum values.

ChangeSet@1.2507.2.2, 2007-06-26 14:24:01-04:00, iggy@amd64.(none) +1 -0
  Bug#24732 Executables do not include Vista manifests
  - Post Merge Fixup

  CMakeLists.txt@1.34, 2007-06-26 14:23:59-04:00, iggy@amd64.(none) +1 -1
    Bug#24732 Executables do not include Vista manifests
    - Post Merge Fixup

ChangeSet@1.1810.3085.3, 2007-06-26 11:26:01-04:00, iggy@amd64.(none) +3 -0
  Bug#24732 Executables do not include Vista manifests
  - Corrected manifest attributes.

  CMakeLists.txt@1.1.24.1, 2007-06-26 11:25:59-04:00, iggy@amd64.(none) +1 -1
    Bug#24732 Executables do not include Vista manifests
    - Use correct value for 64 built binaries.

  win/create_manifest.js@1.4, 2007-06-26 11:25:59-04:00, iggy@amd64.(none) +3 -7
    Bug#24732 Executables do not include Vista manifests
    - Remove type attribute as the only valid value is win32.

  win/mysql_manifest.cmake@1.2, 2007-06-26 11:25:59-04:00, iggy@amd64.(none) +1 -1
    Bug#24732 Executables do not include Vista manifests
    - Remove type attribute.

ChangeSet@1.2495.4.34, 2007-06-26 09:26:58-04:00, cbell@mysql_cab_desk. +2 -0
  BUG#28991 : rpl_events failure in pushbuild 
  
  This patch contains enhancements to the rpl_events test to correct
  timing issues related to the firing of events and verification of the
  results of those events. 

  mysql-test/include/rpl_events.inc@1.6, 2007-06-26 09:26:55-04:00, cbell@mysql_cab_desk. +55 -27
    BUG#28991 : rpl_events failure in pushbuild 
    
    This patch contains refinements to the rpl_events test to remove all
    timing issues related to sleep commands. It also refines the test to
    include additional documentation.

  mysql-test/r/rpl_events.result@1.7, 2007-06-26 09:26:55-04:00, cbell@mysql_cab_desk. +88 -50
    BUG#28991 : rpl_events failure in pushbuild 
    
    This patch contains the result file for the refinements to the 
    rpl_events test.

ChangeSet@1.2403.28.2, 2007-06-26 15:19:42+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#29331 (51)
      Add better handling of GCP Stop
      Only kill "offending" node

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.32.1.6, 2007-06-26 15:19:40+02:00, jonas@perch.ndb.mysql.com +5 -1
    add new error codes

  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.25.2.4, 2007-06-26 15:19:40+02:00, jonas@perch.ndb.mysql.com +1 -1
    add better GCP stop handling

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.100.3.8, 2007-06-26 15:19:40+02:00, jonas@perch.ndb.mysql.com +161 -36
    add better GCP stop handling

ChangeSet@1.2504.2.1, 2007-06-26 14:18:53+02:00, msvensson@pilot.(none) +1 -0
  Bug #29133 mysqld does not exit during shutdown
   - Fix faulty merge by adding back the 'pthread_kill' call that
   wakes up the select thread

  sql/mysqld.cc@1.656.1.2, 2007-06-26 14:18:51+02:00, msvensson@pilot.(none) +1 -0
    Wake up the select thread from 'close_connections', caused by 
    faulty merge

ChangeSet@1.2513.1.1, 2007-06-26 15:36:38+05:00, holyfoot@mysql.com +3 -0
  Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
  
  In the ha_partition::position we don't calculate the number of
  the partition of the record. We use m_last_part_value instead relying on
  that it is set in other place like previous calls of ::write_row().
  In replication we do neither of these calls before ::position().
  Delete_row_log_event::do_exec_row calls find_and_fetch_row() where
  we used position() & rnd_pos() calls to find the record for the
  PARTITION/INNODB table as it posesses InnoDB table flags.
  Fixed by removing HA_PRIMARY_KEY_REQUIRED_FOR_POSITION flag from PARTITION

  mysql-test/r/rpl_partition.result@1.1, 2007-06-26 15:36:36+05:00, holyfoot@mysql.com +195 -0
    New BitKeeper file ``mysql-test/r/rpl_partition.result''

  mysql-test/r/rpl_partition.result@1.0, 2007-06-26 15:36:36+05:00, holyfoot@mysql.com +0 -0

  mysql-test/t/rpl_partition.test@1.1, 2007-06-26 15:36:36+05:00, holyfoot@mysql.com +158 -0
    New BitKeeper file ``mysql-test/t/rpl_partition.test''

  mysql-test/t/rpl_partition.test@1.0, 2007-06-26 15:36:36+05:00, holyfoot@mysql.com +0 -0

  sql/ha_partition.cc@1.92.2.1, 2007-06-26 15:36:36+05:00, holyfoot@mysql.com +2 -1
    Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    
    add HA_PRIMARY_KEY_REQUIRED_FOR_POSITION flag added to PRTITION engine

ChangeSet@1.1810.3101.2, 2007-06-26 12:26:21+02:00, msvensson@pilot.(none) +3 -0
  Bug#25657 mysql-test-run.pl kill itself under ActiveState perl
   - Various fixes for running mysql-test-run.pl on ActiveState perl
     for windows. Reading it's source in win32/win32.c helps...

  mysql-test/lib/mtr_process.pl@1.25.9.2, 2007-06-26 12:26:20+02:00, msvensson@pilot.(none) +16 -1
    Use "real_pid" when killing the process on ActiveState perl for windows
    Wait blocking for the pseudo pid to exit.
    Change "sleep_until_file_created" to return 1 when pidfile has been
    created - this should avoid early wakeup if $pid was 0

  mysql-test/lib/mtr_timer.pl@1.7.1.6, 2007-06-26 12:26:20+02:00, msvensson@pilot.(none) +7 -2
    Wake timer process with signal 15 to avoid to avoid resource leak
    on ActiveState perl for windows.
    Install signal handler in timer process to  exit gracefully

  mysql-test/mysql-test-run.pl@1.30.49.88, 2007-06-26 12:26:20+02:00, msvensson@pilot.(none) +18 -9
    Read "real_pid" of process from pid_file - to be used when killing the
    process on ActiveState perl
    Drop the --console option to mysqld
    Pass "real_pid" to mtr_check_stop_server so it can select to use it
    Correct two argument declarations 

ChangeSet@1.1810.3100.1, 2007-06-25 22:44:22-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #29087. This bug manifested itself for queries that performed
  a lookup into a BINARY index by a key ended with spaces. It caused
  an assertion abort for a debug version and wrong results for non-debug
  versions.
  
  The problem occurred because the function _mi_pack_key stripped off 
  the trailing spaces from binary search keys while the function _mi_make_key
  did not do it when keys were inserted into the index.
  
  Now the function _mi_pack_key does not remove the trailing spaces from
  search keys if they are of the binary type.

  mysql-test/r/binary.result@1.20.1.3, 2007-06-25 22:44:19-07:00, igor@olga.mysql.com +38 -0
    Added a test case for bug #29087.

  mysql-test/t/binary.test@1.17.2.1, 2007-06-25 22:44:19-07:00, igor@olga.mysql.com +38 -0
    Added a test case for bug #29087.

  myisam/mi_key.c@1.38.17.1, 2007-06-25 22:44:19-07:00, igor@olga.mysql.com +6 -6
    Fixed bug #29087. This bug manifested itself for queries that performed
    a lookup into a BINARY index by a key ended with spaces. It caused
    an assertion abort for a debug version and wrong results for non-debug
    versions.
    
    The problem occurred because the function _mi_pack_key stripped off 
    the trailing spaces from binary search keys while the function _mi_make_key
    did not do it when keys were inserted into the index.
    
    Now the function _mi_pack_key does not remove the trailing spaces from
    search keys if they are of the binary type.

ChangeSet@1.1810.3091.3, 2007-06-25 18:41:17+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  end_log_pos data within a transaction are relative to
  the start of the transaction rather than absolute.
  we fix those groups in situ before writing the log out.
  
  additional comments and handling for groups with very
  large single events, as suggested by Guilhem.

  sql/log.cc@1.158.1.54, 2007-06-25 18:41:15+02:00, tnurnberg@sin.intern.azundris.com +73 -27
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    end_log_pos data within a transaction are relative to
    the start of the transaction rather than absolute.
    we fix those groups in situ before writing the log out.
    
    additional comments and handling for groups with very
    large single events, as suggested by Guilhem.

ChangeSet@1.2515, 2007-06-25 19:21:18+03:00, gkodinov@magare.gmz +1 -0
  Bug #26564: Windows implementation of pthread_join crashes
  
  MySQL uses _beginthread()/_endthread() instead of 
  _beginthreadex()/_endthreadex() to create/end its threads
  on Windows.
  According to MSDN  _endthread() does close the thread handle.
  So there's no need the handle to be closed explicitly.
  Besides : WaitForSingleObject(, INFINITE) != WAIT_OBJECT_0) is
  true for all practical cases as the other two possible return 
  codes (according to MSDN) cannot happen in that case the 
  CloseHandle() was actually a dead code.
  Fixed by removing the CloseHandle() call. No test case added
  because it's not possible to test for absence of dead code. 

  include/my_pthread.h@1.116, 2007-06-25 19:21:16+03:00, gkodinov@magare.gmz +1 -2
    Bug #26564: Don't call CloseHandle since we use 
    beginthread/endthread instead of beginthreadex/endthreadex.

ChangeSet@1.2510.2.1, 2007-06-25 15:04:31+02:00, jbruehe@mysql.com +1 -0
  Raise version number after cloning 5.1.20-beta

  configure.in@1.469.1.1, 2007-06-25 15:04:16+02:00, jbruehe@mysql.com +1 -1
    Raise version number after cloning 5.1.20-beta

ChangeSet@1.1810.3077.4, 2007-06-25 16:40:29+05:00, holyfoot@mysql.com +1 -0
  Bug #29247 Double free in libmysqlclient_r when mysql restarted.
  
  If one sets MYSQL_READ_DEFAULTS_FILE and MYSQL_READ_DEFAULT_GROUP options
  after mysql_real_connect() called with that MYSQL instance,
  these options will affect next mysql_reconnect then.
  As we use a copy of the original MYSQL object inside mysql_reconnect,
  and mysql_real_connect frees options.my_cnf_file and _group strings,
  we will free these twice when we execute mysql_reconnect with the
  same MYSQL for the second time.
  
  I don't think we should ever read defaults files handling mysql_reconnect.
  So i just set them to 0 for the temporary MYSQL object there/

  sql-common/client.c@1.83.18.1, 2007-06-25 16:40:27+05:00, holyfoot@mysql.com +1 -0
    Bug #29247 Double free in libmysqlclient_r when mysql restarted.
    
    we don't need mysql_real_connect to reread defaults file in this
    case, so set related parameters to zero

ChangeSet@1.2495.16.4, 2007-06-25 14:42:35+05:00, svoj@mysql.com +1 -0
  BUG#28026 - Falcon: crash if partitions and select for update
  
  Assertion failure may happen with falcon + partition + select for
  update. This may affect other engines as well.
  
  Though assertion failure is fixed with this patch, falcon still
  deadlocks when running falcon_bug_28026.test.

  sql/ha_partition.cc@1.92.1.3, 2007-06-25 14:42:33+05:00, svoj@mysql.com +2 -1
    In case rnd_next fails, we must call ha_rnd_end. This is done
    conditionally (NO_CURRENT_PART_ID != m_part_spec.start_part)
    in ha_partition::ha_rnd_end. Thus we may not reset
    m_part_spec.start_part in case rnd is not ended.

ChangeSet@1.2507.1.2, 2007-06-25 11:37:10+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  fix binlog-writing so that end_log_pos is given correctly even
  within transactions for both SHOW BINLOG and SHOW MASTER STATUS,
  that is as absolute values (from log start) rather than relative
  values (from transaction's start).
  ---
  Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
  into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
  ---
  Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
  into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540

  mysql-test/extra/binlog_tests/binlog.test@1.25, 2007-06-25 11:37:08+02:00, tnurnberg@sin.intern.azundris.com +92 -0
    Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    show that end_log_pos in SHOW BINLOG EVENTS is correct even in transactions.
    show that SHOW MASTER STATUS returns correct values while in transactions
    (so that mysqldump --master-data will work correctly).
    also remove bdb dependency.
    
    manual merge

  mysql-test/r/binlog_stm_binlog.result@1.28, 2007-06-25 11:37:08+02:00, tnurnberg@sin.intern.azundris.com +117 -1
    Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    show that end_log_pos in SHOW BINLOG EVENTS is correct even in transactions.
    show that SHOW MASTER STATUS returns correct values while in transactions
    (so that mysqldump --master-data will work correctly).
    also remove bdb dependency.
    
    manual merge

  sql/log.cc@1.282.1.4, 2007-06-25 11:37:08+02:00, tnurnberg@sin.intern.azundris.com +58 -2
    Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    fix output for SHOW BINLOG EVENTS so that end_log_pos is given correctly
    even within transactions. do this by rewriting the commit-buffer in place.
    
    manual merge

ChangeSet@1.1810.3091.2, 2007-06-25 11:34:23+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  fix binlog-writing so that end_log_pos is given correctly even
  within transactions for both SHOW BINLOG and SHOW MASTER STATUS,
  that is as absolute values (from log start) rather than relative
  values (from transaction's start).
  ---
  Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
  into  sin.intern.azundris.com:/home/tnurnberg/22540/50-22540

  mysql-test/t/binlog.test@1.4.9.1, 2007-06-25 11:34:22+02:00, tnurnberg@sin.intern.azundris.com +91 -2
    Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    show that end_log_pos in SHOW BINLOG EVENTS is correct even in transactions.
    show that SHOW MASTER STATUS returns correct values while in transactions
    (so that mysqldump --master-data will work correctly).
    also remove bdb dependency.

  mysql-test/r/binlog.result@1.4.7.1, 2007-06-25 11:34:22+02:00, tnurnberg@sin.intern.azundris.com +119 -3
    Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    show that end_log_pos in SHOW BINLOG EVENTS is correct even in transactions.
    show that SHOW MASTER STATUS returns correct values while in transactions
    (so that mysqldump --master-data will work correctly).
    also remove bdb dependency.
    ---
    manual merge

  sql/log.cc@1.158.1.53, 2007-06-25 11:34:22+02:00, tnurnberg@sin.intern.azundris.com +59 -4
    Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    fix output for SHOW BINLOG EVENTS so that end_log_pos is given correctly
    even within transactions. do this by rewriting the commit-buffer in place.

ChangeSet@1.2495.25.1, 2007-06-25 13:31:34+05:00, holyfoot@mysql.com +1 -0
  Bug #29252 Assertion 'table->file || table->file->inited == handler::NONE' failed
  
  when index_init() or rnd_init() return an error, we still set
  handler->inited to INDEX or RND in ha_index_init and ha_rnd_init.
  As caller doesn't call ha_*_end() in this case, we get DBUG_ASSERT
  failed.

  sql/handler.h@1.262.1.3, 2007-06-25 13:31:33+05:00, holyfoot@mysql.com +7 -4
    Bug #29252 Assertion 'table->file || table->file->inited == handler::NONE' failed.
    
    make sure that 'inited' is handler::NONE if index_init() or rnd_init()
    returned an error

ChangeSet@1.1810.3098.1, 2007-06-25 10:44:52+03:00, gkodinov@magare.gmz +3 -0
  Bug #29154: LOCK TABLES is not atomic when >1 InnoDB tables are locked
    LOCK TABLES takes a list of tables to lock. It may lock several 
    tables successfully and then encounter a tables that it can't lock, 
    e.g. because it's locked. In such case it needs to undo the locks on
    the already locked tables. And it does that. But it has also notified
    the relevant table storage engine handlers that they should lock.
    The only reliable way to ensure that the table handlers will give up
    their locks is to end the transaction. This is what UNLOCK TABLE 
    does : it ends the transaction if there were locked tables by LOCK 
    tables.
    It is possible to end the transaction when the lock fails in 
    LOCK TABLES because LOCK TABLES ends the transaction at its start 
    already. 
    Fixed by ending (again) the transaction when LOCK TABLES fails to
    lock a table.

  mysql-test/t/innodb_mysql.test@1.3.30.1, 2007-06-25 10:44:51+03:00, gkodinov@magare.gmz +35 -0
    Bug #29154: test case

  mysql-test/r/innodb_mysql.result@1.3.15.1, 2007-06-25 10:44:51+03:00, gkodinov@magare.gmz +15 -0
    Bug #29154: test case

  sql/sql_parse.cc@1.426.158.1, 2007-06-25 10:44:51+03:00, gkodinov@magare.gmz +12 -1
    Bug #29154: end the trasaction at a failing 
    LOCK TABLES so the handler can free its locks.

ChangeSet@1.2403.27.2, 2007-06-25 07:12:27+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - post merge 50/51 - bug#29057 bug#29067 and bug#29118 

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.130.2.15, 2007-06-25 07:12:25+02:00, jonas@perch.ndb.mysql.com +1 -1
    post merge

ChangeSet@1.1810.2126.67, 2007-06-25 07:05:25+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#29057 bug#29067 and bug#29118
    Fix 3 problems in REDO validation that could(will) lead to "Error while reading REDO log"

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.32.22.1, 2007-06-25 07:05:24+02:00, jonas@perch.ndb.mysql.com +3 -2
    add new state

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.53.1, 2007-06-25 07:05:24+02:00, jonas@perch.ndb.mysql.com +259 -80
    fix bugs + add debugging

ChangeSet@1.2508.2.2, 2007-06-25 05:35:45+05:00, gshchepa@gleb.loc +1 -0
  rpl_skip_error.result:
    Merge with 5.1.

  mysql-test/r/rpl_skip_error.result@1.14, 2007-06-25 05:35:08+05:00, gshchepa@gleb.loc +2 -2
    Merge with 5.1.

ChangeSet@1.2403.18.69, 2007-06-24 22:14:09+02:00, pekka@clam.ndb.mysql.com +1 -0
  ndb - bug#29176 pgman: another missing stack pruning related to drop table

  storage/ndb/src/kernel/blocks/pgman.cpp@1.20.1.7, 2007-06-24 22:12:18+02:00, pekka@clam.ndb.mysql.com +10 -1
    another missing pgman stack pruning related to drop_page

ChangeSet@1.1810.3095.1, 2007-06-24 19:44:54+05:00, svoj@mysql.com +3 -0
  BUG#15787 - MySQL crashes when archive table exceeds 2GB
  
  Max compressed file size was calculated incorretly causing server
  crash on INSERT.
  
  With this patch we use proper max file size provided by zlib.
  
  Affects 5.0 only.

  mysql-test/r/archive-big.result@1.1, 2007-06-24 19:44:51+05:00, svoj@mysql.com +19 -0
    New BitKeeper file ``mysql-test/r/archive-big.result''

  mysql-test/r/archive-big.result@1.0, 2007-06-24 19:44:51+05:00, svoj@mysql.com +0 -0

  mysql-test/t/archive-big.test@1.1, 2007-06-24 19:44:51+05:00, svoj@mysql.com +25 -0
    New BitKeeper file ``mysql-test/t/archive-big.test''

  mysql-test/t/archive-big.test@1.0, 2007-06-24 19:44:51+05:00, svoj@mysql.com +0 -0

  sql/ha_archive.cc@1.60.18.1, 2007-06-24 19:44:51+05:00, svoj@mysql.com +2 -1
    When calculating max compressed file size, use the real offset size
    that is provided by zlib, instead of sizeof(z_off_t), which may be
    different from actual offset size.
    
    When we're about to write and the data file is almost full flush gzio
    buffer to get accurate real file size.

ChangeSet@1.1810.3093.1, 2007-06-23 23:33:55-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #25602. A query with DISTINCT in the select list to which
  the loose scan optimization for grouping queries was applied returned 
  a wrong result set when the query was used with the SQL_BIG_RESULT
  option.
  
  The SQL_BIG_RESULT option forces to use sorting algorithm for grouping
  queries instead of employing a suitable index. The current loose scan
  optimization is applied only for one table queries when the suitable
  index is covering. It does not make sense to use sort algorithm in this
  case. However the create_sort_index function does not take into account
  the possible choice of the loose scan to implement the DISTINCT operator
  which makes sorting unnecessary. Moreover the current implementation of
  the loose scan for queries with distinct assumes that sorting will
  never happen. Thus in this case create_sort_index should not call
  the function filesort.

  mysql-test/r/group_min_max.result@1.23.1.6, 2007-06-23 23:33:52-07:00, igor@olga.mysql.com +21 -0
    Added a test case for bug #25602.

  mysql-test/t/group_min_max.test@1.21.1.7, 2007-06-23 23:33:52-07:00, igor@olga.mysql.com +22 -0
    Added a test case for bug #25602.

  sql/sql_select.cc@1.312.162.1, 2007-06-23 23:33:52-07:00, igor@olga.mysql.com +6 -2
    Fixed bug #25602. A query with DISTINCT in the select list to which
    the loose scan optimization for grouping queries was applied returned 
    a wrong result set when the query was used with the SQL_BIG_RESULT
    option.
    
    The SQL_BIG_RESULT option forces to use sorting algorithm for grouping
    queries instead of employing a suitable index. The current loose scan
    optimization is applied only for one table queries when the suitable
    index is covering. It does not make sense to use sort algorithm in this
    case. However the create_sort_index function does not take into account
    the possible choice of the loose scan to implement the DISTINCT operator
    which makes sorting unnecessary. Moreover the current implementation of
    the loose scan for queries with distinct assumes that sorting will
    never happen. Thus in this case create_sort_index should not call
    the function filesort.

ChangeSet@1.1810.3092.1, 2007-06-24 01:20:14+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #29095.
  INSERT into table from SELECT from the same table
  with ORDER BY and LIMIT was inserting other data
  than sole SELECT ... ORDER BY ... LIMIT returns.
  
  One part of the patch for bug #9676 improperly pushed
  LIMIT to temporary table in the presence of the ORDER BY
  clause.
  That part has been removed.

  mysql-test/r/insert_select.result@1.35.1.13, 2007-06-24 01:20:01+05:00, gshchepa@gleb.loc +31 -0
    Expanded the test case for bug #9676.
    Created a test case for bug #29095.

  mysql-test/t/insert_select.test@1.34.1.5, 2007-06-24 01:19:59+05:00, gshchepa@gleb.loc +25 -0
    Expanded the test case for bug #9676.
    Created a test case for bug #29095.

  sql/sql_select.cc@1.312.1.222, 2007-06-24 01:19:55+05:00, gshchepa@gleb.loc +1 -2
    Fixed bug #29095.
    One part of the patch for bug #9676 improperly pushed
    LIMIT to temporary table in the presence of the ORDER BY
    clause.
    That part has been removed.

ChangeSet@1.2495.24.3, 2007-06-23 19:16:51+02:00, guilhem@gbichot3.local +4 -0
  Fix for BUG#29318 "Statements prepared with PREPARE and with one
  parameter don't use query cache"
  Thanks to the fix of BUG#26842, statements prepared with SQL PREPARE
  and having parameters can now use the query cache.

  mysql-test/include/query_cache_sql_prepare.inc@1.6, 2007-06-23 19:16:48+02:00, guilhem@gbichot3.local +10 -2
    now, statements prepared with SQL PREPARE use the query cache even
    when they have parameters.

  mysql-test/r/query_cache_ps_no_prot.result@1.4, 2007-06-23 19:16:48+02:00, guilhem@gbichot3.local +47 -34
    updated result: we see caching happened.

  mysql-test/r/query_cache_ps_ps_prot.result@1.2, 2007-06-23 19:16:48+02:00, guilhem@gbichot3.local +47 -34
    updated result: we see caching happened

  sql/sql_prepare.cc@1.226, 2007-06-23 19:16:48+02:00, guilhem@gbichot3.local +0 -12
    query expansion does not insert user variables' references anymore,
    it now inserts parameters' values (BUG#26842's fix did this);
    so we can use the query cache.

ChangeSet@1.2495.24.2, 2007-06-22 19:58:27+04:00, kostja@bodhi.(none) +1 -0
  Fix broken automatic dependency tracking of Automake in sql/:
  The embedded library is still broken, but there the situation
  with dependencies is even more broken.

  sql/Makefile.am@1.186.1.3, 2007-06-22 19:58:25+04:00, kostja@bodhi.(none) +12 -18
    Fix broken automatic dependency tracking of Automake in sql/:
    use a convenience library to specify additional includes that
    are required to compile files ha_ndbcluster_*, and then
    add this convenience library to the main project.
    The embedded library is still broken, but there the situation
    with dependencies is even more broken.

ChangeSet@1.2482.8.39, 2007-06-22 17:05:14+02:00, jmiller@mysql.com +4 -0
  updated for bug #28770

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.41, 2007-06-22 17:02:07+02:00, jmiller@mysql.com +2 -1

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.135.1.2, 2007-06-22 17:02:24+02:00, jmiller@mysql.com +9 -0

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.15, 2007-06-22 17:03:00+02:00, jmiller@mysql.com +47 -0

  storage/ndb/test/run-test/daily-basic-tests.txt@1.92.1.4, 2007-06-22 17:05:03+02:00, jmiller@mysql.com +4 -0

ChangeSet@1.2482.111.2, 2007-06-22 15:38:23+02:00, thek@adventure.(none) +1 -0
  Bug #28846 Use of undocumented Prepared Statements crashes server
  
  - Manual merge patch.

  sql/sql_yacc.yy@1.576.4.2, 2007-06-22 15:38:21+02:00, thek@adventure.(none) +6 -0
    Corrected merge error. ALTER VIEW rules has been split in two and both
    rules need to be checked for SP-context.

ChangeSet@1.2495.4.33, 2007-06-22 18:32:06+05:00, bar@mysql.com +1 -0
  After merge fix.

  sql/item_sum.cc@1.225, 2007-06-22 18:32:04+05:00, bar@mysql.com +1 -1
    After merge fix.

ChangeSet@1.1810.3089.1, 2007-06-22 15:34:28+03:00, gkodinov@magare.gmz +1 -0
  Bug #27383: Crash in test "mysql_client_test"
  
  The C optimizer may decide that data access operations
  through pointer of different type are not related to 
  the original data (strict aliasing).
  This is what happens in fetch_long_with_conversion(),
  when called as part of mysql_stmt_fetch() : it tries 
  to check for truncation errors by first storing float
  (and other types of data) into a char * buffer and then 
  accesses them through a float pointer.
  This is done to prevent the effects of excess precision
  when using FPU registers.
  However the doublestore() macro converts a double pointer
  to an union pointer. This violates the strict aliasing rule.
  Fixed by making the intermediary variables volatile (
  to not re-introduce the excess precision bug) and using
  the intermediary value instead of the char * buffer.
  Note that there can be loss of precision for both signed
  and unsigned 64 bit integers converted to double and back,
  so the check must stay there (even for compatibility 
  reasons).
  Based on the excellent analysis in bug 28400.

  libmysql/libmysql.c@1.233.16.1, 2007-06-22 15:34:27+03:00, gkodinov@magare.gmz +16 -11
    Bug #27383: avoid pointer aliasing problems while 
    not re-violating the Intel FPU gcc bug.

ChangeSet@1.1810.3087.1, 2007-06-22 17:18:40+05:00, bar@mysql.com +6 -0
  Bug#28925 GROUP_CONCAT inserts wrong separators for a ucs2 column
  Problem: separator was not converted to the result character set,
  so the result was a mixture of two different character sets,
  which was especially bad for UCS2.
  Fix: convert separator to the result character set.

  mysql-test/r/ctype_ucs.result@1.39.1.13, 2007-06-22 17:18:38+05:00, bar@mysql.com +21 -0
    Adding test case

  mysql-test/r/ctype_ucs2_def.result@1.3.2.1, 2007-06-22 17:18:38+05:00, bar@mysql.com +8 -0
    Adding test case

  mysql-test/t/ctype_ucs.test@1.36.1.15, 2007-06-22 17:18:38+05:00, bar@mysql.com +18 -0
    Adding test case

  mysql-test/t/ctype_ucs2_def.test@1.3.2.1, 2007-06-22 17:18:38+05:00, bar@mysql.com +13 -0
    Adding test case

  sql/item_sum.cc@1.170.1.39, 2007-06-22 17:18:38+05:00, bar@mysql.com +21 -0
    Adding conversion of separator to the result character set

  sql/sql_yacc.yy@1.371.114.1, 2007-06-22 17:18:38+05:00, bar@mysql.com +5 -2
    Fixing GROUPC_CONCAT problems when "mysqld --default-character-set=ucs2".

ChangeSet@1.1616.3058.3, 2007-06-22 17:12:40+05:00, ramil@mysql.com +1 -0
  Fix for bug #29079: Semantics of "bigint" depend on platform specifics (size, signedness of char ?)
  
  Problem: long and long long types mess in a comparison may lead to wrong results on some platforms.
  Fix: prefer [unsigned] long long as [u]longlong as it's used unconditionally in many places.

  include/my_global.h@1.47.1.67, 2007-06-22 17:12:39+05:00, ramil@mysql.com +6 -1
    Fix for bug #29079: Semantics of "bigint" depend on platform specifics (size, signedness of char ?)
      - use [unsigned] long long as [u]longlong if sizeof(long long) == 8, to avoid type mess,
        as we use [unsigned] long long unconditionally in many places, for example in constants 
        with [U]LL suffix.

ChangeSet@1.1810.3014.8, 2007-06-22 11:55:48+02:00, thek@adventure.(none) +11 -0
  Bug#28846 Use of undocumented Prepared Statements crashes server
  
  ALTER VIEW is currently not supported as a prepared statement
  and should be disabled as such as they otherwise could cause server crashes.
  
  ALTER VIEW is currently not supported when called from stored
  procedures or functions for related reasons and should also be disabled.
  
  This patch disables these DDL statements and adjusts the appropriate test
  cases accordingly.
  
  Additional tests has been added to reflect on the fact that we do support
  CREATE/ALTER/DROP TABLE for Prepared Statements (PS), Stored Procedures (SP)
  and PS within SP.

  mysql-test/r/ps_1general.result@1.50.1.6, 2007-06-22 11:55:46+02:00, thek@adventure.(none) +2 -0
    - Updated test to reflect on the new policy to disallow ALTER VIEW within SP.

  mysql-test/r/sp-dynamic.result@1.5.1.1, 2007-06-22 11:55:46+02:00, thek@adventure.(none) +17 -1
    - Added PS ALTER TABLE test from within SP-context to demonstrate that CREATE/ALTER/DROP
    TABLE statements is working.
    - Added PS CREATE/ALTER/DROP VIEW tests from within SP-context to show that
    ALTER VIEW is not supported, CREATE VIEW/DROP VIEW are supported.

  mysql-test/r/sp-error.result@1.102.1.12, 2007-06-22 11:55:46+02:00, thek@adventure.(none) +2 -2
    - Updated test to reflect on the new policy to disallow VIEW DDL within SP.

  mysql-test/t/ps_1general.test@1.25.1.7, 2007-06-22 11:55:46+02:00, thek@adventure.(none) +4 -0
    - Updated test to reflect on the new policy to disallow VIEW DDL within SP.

  mysql-test/t/sp-dynamic.test@1.4, 2007-06-22 11:55:46+02:00, thek@adventure.(none) +10 -2
    - Add PS ALTER TABLE test from within SP to demonstrate that CREATE/ALTER/DROP
    TABLE statements are supported.

  mysql-test/t/sp-error.test@1.100.1.15, 2007-06-22 11:55:46+02:00, thek@adventure.(none) +5 -5
    - Updated test to reflect on the new policy to disallow ALTER VIEW
    within SP-context.
    - Changed error code 1314 to the more abstract ER_SP_BADSTATEMENT.

  sql/sql_class.h@1.230.71.1, 2007-06-22 11:55:46+02:00, thek@adventure.(none) +7 -0
    - Added comment for clarity

  sql/sql_parse.cc@1.426.157.1, 2007-06-22 11:55:46+02:00, thek@adventure.(none) +4 -0
    - Added comment for clarity

  sql/sql_prepare.cc@1.142.30.1, 2007-06-22 11:55:46+02:00, thek@adventure.(none) +7 -1
    - Disallow ALTER VIEW as prepared statements until they are
      properly supported. Note that SQLCOM_CREATE_VIEW also handles ALTER VIEW
      statements.

  sql/sql_view.cc@1.78.24.1, 2007-06-22 11:55:46+02:00, thek@adventure.(none) +9 -10
    - converted to doxygen comments
    - Added comment for clarity

  sql/sql_yacc.yy@1.371.113.1, 2007-06-22 11:55:46+02:00, thek@adventure.(none) +5 -0
    - Disallow ALTER VIEW statements within a SP.
    If the parser is operating within the SP context, this is shown
    on the sp->sphead pointer. If this flag is set for view DDL operations
    we stop parsing with the error 'ER_SP_BAD_STATEMENT'.

ChangeSet@1.2495.4.31, 2007-06-22 07:32:39+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Fixes to replication team tree.

  storage/innobase/handler/ha_innodb.cc@1.345, 2007-06-22 07:32:35+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Using DBUG_RETURN() instead of normal return.

ChangeSet@1.2495.8.11, 2007-06-22 09:59:23+05:00, holyfoot@mysql.com +1 -0
  merging fix

  mysql-test/r/rpl_skip_error.result@1.13, 2007-06-22 09:59:21+05:00, holyfoot@mysql.com +1 -1
    merging fix

ChangeSet@1.1810.3077.3, 2007-06-22 09:28:38+05:00, holyfoot@mysql.com +2 -0
  rpl_skip_error.test fixed

  mysql-test/r/rpl_skip_error.result@1.7.1.3, 2007-06-22 09:28:36+05:00, holyfoot@mysql.com +1 -1
    test result fixed

  mysql-test/t/rpl_skip_error.test@1.7.1.3, 2007-06-22 09:28:36+05:00, holyfoot@mysql.com +1 -0
    inconsistent column results hidden

ChangeSet@1.2495.4.30, 2007-06-22 02:27:18+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  BUG#23051 (READ COMMITTED breaks mixed and statement-based replication):
  Removing dead code.

  storage/innobase/handler/ha_innodb.cc@1.344, 2007-06-22 02:27:11+02:00, mats@kindahl-laptop.dnsalias.net +0 -2
    Removing dead code.

ChangeSet@1.2495.4.28, 2007-06-22 01:39:23+02:00, mats@kindahl-laptop.dnsalias.net +9 -0
  BUG#28722 (Multi-engine statements on has_own_binlogging engine):
  Test fixes resulting from changed semantics.

  mysql-test/extra/rpl_tests/rpl_row_UUID.test@1.7, 2007-06-22 01:39:18+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Using same engine throughout to prevent NDB tests from failing.

  mysql-test/r/binlog_multi_engine.result@1.7, 2007-06-22 01:39:18+02:00, mats@kindahl-laptop.dnsalias.net +3 -14
    Result change.

  mysql-test/t/binlog_multi_engine.test@1.7, 2007-06-22 01:39:19+02:00, mats@kindahl-laptop.dnsalias.net +0 -1
    Removing garbage.

  mysql-test/r/ndb_read_multi_range.result@1.14, 2007-06-22 01:39:18+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Result change.

  mysql-test/r/ndb_trigger.result@1.5, 2007-06-22 01:39:19+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change.

  mysql-test/t/ndb_read_multi_range.test@1.17, 2007-06-22 01:39:19+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Using ndbcluster for table used inside trigger.

  mysql-test/t/ndb_trigger.test@1.5, 2007-06-22 01:39:19+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Using ndbcluster for table used inside trigger.

  mysql-test/r/rpl_row_UUID.result@1.5, 2007-06-22 01:39:19+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Result change.

  mysql-test/r/rpl_ndb_UUID.result@1.6, 2007-06-22 01:39:19+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Result change.

ChangeSet@1.2495.22.2, 2007-06-22 01:08:26+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#23051 (READ COMMITTED breaks mixed and statement-based replication):
  Minor fixes to get proper detection of transaction isolation level when
  inside external_lock().

  mysql-test/t/disabled.def@1.264.1.1, 2007-06-22 01:08:19+02:00, mats@kindahl-laptop.dnsalias.net +0 -1
    Enabling innodb.test again.

  mysql-test/t/innodb.test@1.166.1.1, 2007-06-22 01:08:20+02:00, mats@kindahl-laptop.dnsalias.net +6 -2
    Fixing some error codes. Test currently requires MIXED or ROW mode since
    READ-COMMITTED and READ-UNCOMMITTED are not safe for STATEMENT mode, i.e.,
    when the binary log is enabled.

  storage/innobase/handler/ha_innodb.cc@1.343, 2007-06-22 01:08:20+02:00, mats@kindahl-laptop.dnsalias.net +4 -3
    Using tx_isolation since trx->isolation_level is not defined when
    inside external_lock().

ChangeSet@1.2482.8.38, 2007-06-21 23:29:14+02:00, jmiller@mysql.com +1 -0
  select_ndb_apply_status.inc:
    new support file that I missed during last check ing, sorry

  mysql-test/include/select_ndb_apply_status.inc@1.1, 2007-06-21 23:29:03+02:00, jmiller@mysql.com +13 -0
    new support file that I missed during last check ing, sorry

  mysql-test/include/select_ndb_apply_status.inc@1.0, 2007-06-21 23:29:03+02:00, jmiller@mysql.com +0 -0

ChangeSet@1.2482.62.30, 2007-06-21 21:58:59+02:00, jmiller@mysql.com +12 -0
  Many files:
    New test cases for generic apply status table
  rpl_ndb_dd_advance.test:
    Updated test case to not run sooo long
  show_binlog_using_logname.inc, tpcb_disk_data.inc:
    New support file 
  rpl_ndb_dd_advance.result:
    Updated result
  tpcb.inc:
    New support file for Updated test case to not run sooo long

  mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test@1.1, 2007-06-21 21:53:45+02:00, jmiller@mysql.com +290 -0
    New test cases for generic apply status table

  mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test@1.0, 2007-06-21 21:53:45+02:00, jmiller@mysql.com +0 -0

  mysql-test/include/show_binlog_using_logname.inc@1.1, 2007-06-21 21:56:33+02:00, jmiller@mysql.com +13 -0
    New support file 

  mysql-test/include/show_binlog_using_logname.inc@1.0, 2007-06-21 21:56:33+02:00, jmiller@mysql.com +0 -0

  mysql-test/include/tpcb.inc@1.1, 2007-06-21 21:50:16+02:00, jmiller@mysql.com +155 -0
    New support file for Updated test case to not run sooo long

  mysql-test/include/tpcb.inc@1.0, 2007-06-21 21:50:16+02:00, jmiller@mysql.com +0 -0

  mysql-test/include/tpcb_disk_data.inc@1.1, 2007-06-21 21:55:18+02:00, jmiller@mysql.com +166 -0
    New support file 

  mysql-test/include/tpcb_disk_data.inc@1.0, 2007-06-21 21:55:18+02:00, jmiller@mysql.com +0 -0

  mysql-test/r/rpl_ndb_dd_advance.result@1.11, 2007-06-21 21:50:46+02:00, jmiller@mysql.com +44 -134
    Updated result

  mysql-test/r/rpl_ndb_mix_innodb.result@1.1, 2007-06-21 21:58:01+02:00, jmiller@mysql.com +129 -0
    New test cases for generic apply status table

  mysql-test/r/rpl_ndb_mix_innodb.result@1.0, 2007-06-21 21:58:01+02:00, jmiller@mysql.com +0 -0

  mysql-test/r/rpl_ndb_stm_innodb.result@1.1.1.1, 2007-06-21 21:57:43+02:00, jmiller@mysql.com +98 -6
    New test cases for generic apply status table

  mysql-test/t/rpl_ndb_dd_advance.test@1.11.1.1, 2007-06-21 21:49:41+02:00, jmiller@mysql.com +20 -171
    Updated test case to not run sooo long

  mysql-test/t/rpl_ndb_mix_innodb-master.opt@1.1, 2007-06-21 21:54:24+02:00, jmiller@mysql.com +1 -0
    New test cases for generic apply status table

  mysql-test/t/rpl_ndb_mix_innodb-master.opt@1.0, 2007-06-21 21:54:24+02:00, jmiller@mysql.com +0 -0

  mysql-test/t/rpl_ndb_mix_innodb.test@1.1, 2007-06-21 21:53:01+02:00, jmiller@mysql.com +36 -0
    New test cases for generic apply status table

  mysql-test/t/rpl_ndb_mix_innodb.test@1.0, 2007-06-21 21:53:01+02:00, jmiller@mysql.com +0 -0

  mysql-test/t/rpl_ndb_stm_innodb-master.opt@1.2, 2007-06-21 21:54:13+02:00, jmiller@mysql.com +1 -1
    New test cases for generic apply status table

  mysql-test/t/rpl_ndb_stm_innodb.test@1.1.2.1, 2007-06-21 21:53:28+02:00, jmiller@mysql.com +32 -59
    New test cases for generic apply status table

ChangeSet@1.2482.109.1, 2007-06-21 14:02:46+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
  BUG#23051 (READ COMMITTED breaks mixed and statement-based replication):
  Moving error generating code from table_flags() to external_lock().

  include/my_base.h@1.102, 2007-06-21 14:02:38+02:00, mats@kindahl-laptop.dnsalias.net +3 -1
    Adding handler error code HA_ERR_LOGGING_IMPOSSIBLE

  storage/innobase/handler/ha_innodb.cc@1.342, 2007-06-21 14:02:38+02:00, mats@kindahl-laptop.dnsalias.net +27 -27
    Moving error generating code from table_flags() to external_lock().

ChangeSet@1.2482.108.1, 2007-06-21 13:34:06+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#28722 (Multi-engine statements on has_own_binlogging engine):
  WL#3931 (Multi-table statement involving self-logging engines):
  
  Adding logic to generate error if more than one engine is involved in
  the statement and at least one engine is self-logging (i.e., has the
  HA_HAS_OWN_BINLOGGING table flags set).

  mysql-test/r/binlog_multi_engine.result@1.3.1.1, 2007-06-21 13:34:03+02:00, mats@kindahl-laptop.dnsalias.net +7 -15
    Result change.

  mysql-test/t/binlog_multi_engine.test@1.3.1.1, 2007-06-21 13:34:03+02:00, mats@kindahl-laptop.dnsalias.net +7 -0
    Errors now generated for some statements due to NDB setting the
    HA_HAS_OWN_BINLOGGING flag.

  sql/sql_base.cc@1.411, 2007-06-21 13:34:03+02:00, mats@kindahl-laptop.dnsalias.net +43 -14
    Computing both the intersection and union of all table flags in the
    logic to decide logging format.
    
    Calculating if there are more than one engine involved in the statement.
    For this case, we only consider engines that hold tables that data is
    written to.
    
    Adding logic to generate error if more than one engine is involved in
    the statement and at least one engine is self-logging (i.e., has the
    HA_HAS_OWN_BINLOGGING table flags set).
    ---
    Renaming variable.

ChangeSet@1.1810.3077.2, 2007-06-21 15:25:28+05:00, holyfoot@mysql.com +2 -0
  rpl_skip_error test fixed

  mysql-test/r/rpl_skip_error.result@1.7.1.2, 2007-06-21 15:25:26+05:00, holyfoot@mysql.com +1 -1
    result fixed

  mysql-test/t/rpl_skip_error.test@1.7.1.2, 2007-06-21 15:25:26+05:00, holyfoot@mysql.com +1 -0
    master port dependency eliminated

ChangeSet@1.2495.18.2, 2007-06-21 11:48:01+05:00, holyfoot@mysql.com +2 -0
  merging

  mysql-test/r/rpl_skip_error.result@1.10, 2007-06-21 11:47:59+05:00, holyfoot@mysql.com +3 -2
    merging

  mysql-test/t/rpl_skip_error.test@1.11, 2007-06-21 11:47:59+05:00, holyfoot@mysql.com +1 -0
    merging

ChangeSet@1.1810.3066.7, 2007-06-21 02:11:28+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #28293.
  Occasionally mysqlbinlog --hexdump failed with error:
    ERROR 1064 (42000) at line ...: You have an error in your
    SQL syntax; check the manual that corresponds to your MySQL
    server version for the right syntax to use near
    'Query thread_id=... exec_time=... error_code=...
  
  When the length of hexadecimal dump of binlog header was
  divisible by 16, commentary sign '#' after header was lost.
  The Log_event::print_header function has been modified to always
  finish hexadecimal binlog header with "\n# ".

  mysql-test/r/mysqlbinlog.result@1.25.1.10, 2007-06-21 02:11:16+05:00, gshchepa@gleb.loc +6 -0
    Updated test case for bug #28293.

  mysql-test/t/mysqlbinlog.test@1.21.1.28, 2007-06-21 02:11:16+05:00, gshchepa@gleb.loc +13 -0
    Updated test case for bug #28293.

  sql/log_event.cc@1.174.20.1, 2007-06-21 02:11:15+05:00, gshchepa@gleb.loc +5 -1
    Fixed bug #28293.
    The Log_event::print_header function has been modified to always
    finish hexadecimal binlog header with "\n# ".

ChangeSet@1.1810.3083.1, 2007-06-20 12:43:14-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #29104: assertion abort for grouping queries using views.
  The abort happened when a query contained a conjunctive predicate
  of the form 'view column = constant' in the WHERE condition and 
  the grouping list also contained a reference to a view column yet
  a different one.
  
  Removed the failing assertion as invalid in a general case.
  
  Also fixed a bug that prevented applying some optimization for grouping
  queries using views. If the WHERE condition of such a query contains
  a conjunctive condition of the form 'view column = constant' and
  this view column is used in the grouping list then grouping by this
  column can be eliminated. The bug blocked performing this elimination.

  mysql-test/r/view.result@1.138.1.70, 2007-06-20 12:43:10-07:00, igor@olga.mysql.com +24 -0
    Added a test case for bug #29104.

  mysql-test/t/view.test@1.126.1.62, 2007-06-20 12:43:10-07:00, igor@olga.mysql.com +24 -0
    Added a test case for bug #29104.

  sql/item.cc@1.113.93.1, 2007-06-20 12:43:10-07:00, igor@olga.mysql.com +4 -6
    Fixed bug #29104: assertion abort for grouping queries using views.
    The abort happened when a query contained a conjunctive predicate
    of the form 'view column = constant' in the WHERE condition and 
    the grouping list also contained a reference to a view column yet
    a different one.
    
    Removed the failing assertion as invalid in a general case.
    
    Also fixed a bug that prevented applying some optimization for grouping
    queries using views. If the WHERE condition of such a query contains
    a conjunctive condition of the form 'view column = constant' and
    this view column is used in the grouping list then grouping by this
    column can be eliminated. The bug blocked performing this elimination.
    This bug was in the function Item_field::eq while the failing
    assertion was in the function Item_direct_view_ref::eq.

ChangeSet@1.1810.3081.1, 2007-06-20 19:22:27+03:00, monty@mysql.com +5 -0
  Allow multiple calls to mysql_server_end()
  (Part of fix for Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit)
  Give correct error message if InnoDB table is not found
  (This allows us to drop a an innodb table that is not in the InnoDB registery)

  BitKeeper/etc/ignore@1.210.1.41, 2007-06-20 19:13:51+03:00, monty@mysql.com +1 -0
    added include/abi_check

  BitKeeper/etc/ignore@1.210.1.40, 2007-06-20 19:13:32+03:00, monty@mysql.com +1 -0
    added debian/defs.mk

  BitKeeper/etc/ignore@1.210.1.39, 2007-06-20 19:13:26+03:00, monty@mysql.com +1 -0
    added debian/control

  libmysql/libmysql.c@1.233.1.24, 2007-06-20 19:22:25+03:00, monty@mysql.com +15 -0
    Allow multiple calls to mysql_server_end()
    (Part of fix for Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit)

  mysql-test/t/innodb_mysql.test@1.3.28.1, 2007-06-20 19:22:25+03:00, monty@mysql.com +14 -0
    Test case for drop of table that only has a .frm file

  mysql-test/r/innodb_mysql.result@1.3.14.1, 2007-06-20 19:22:25+03:00, monty@mysql.com +8 -0
    Test case for drop of table that only has a .frm file

  sql/ha_innodb.cc@1.202.44.1, 2007-06-20 19:22:25+03:00, monty@mysql.com +1 -1
    Give correct error message if InnoDB table is not found.
    (This allows us to drop a an innodb table that is not in the InnoDB registery)

ChangeSet@1.2495.8.7, 2007-06-20 16:26:14+03:00, gkodinov@magare.gmz +1 -0
  fixed a (merge?) problem running the tests:
  now the cluster related commands have 'use db'
  in the binlog.

  mysql-test/r/rpl_ndb_dd_basic.result@1.11, 2007-06-20 16:26:13+03:00, gkodinov@magare.gmz +4 -4
    fixed a (merge?) problem running the tests:
    now the cluster related commands have 'use db'
    in the binlog.

ChangeSet@1.1810.3066.6, 2007-06-20 13:15:46+03:00, gkodinov@magare.gmz +1 -0
  port of the fix for bug 19116 4.1-opt -> 5.0-opt

  mysql-test/r/rpl_change_master.result@1.17.1.3, 2007-06-20 13:15:45+03:00, gkodinov@magare.gmz +66 -4
    port of the fix for bug 19116 4.1-opt -> 5.0-opt

ChangeSet@1.1810.3076.2, 2007-06-20 14:21:48+05:00, gshchepa@gleb.loc +2 -0
  metadata.test, metadata.result:
    Updated test case for bug #28898. Additional cleanup.

  mysql-test/r/metadata.result@1.18, 2007-06-20 14:20:41+05:00, gshchepa@gleb.loc +1 -1
    Updated test case for bug #28898. Additional cleanup.

  mysql-test/t/metadata.test@1.9, 2007-06-20 14:19:48+05:00, gshchepa@gleb.loc +1 -1
    Updated test case for bug #28898. Additional cleanup.

ChangeSet@1.1810.3077.1, 2007-06-20 14:05:49+05:00, holyfoot@mysql.com +3 -0
  Bug #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists.
  
  slave_sql thread calls thd->clear_error() to force error to be ignored,
  though this method didn't clear thd->killed state, what causes
  slave_sql thread to stop.
  
  clear thd->killed state if we ignore an error

  mysql-test/r/rpl_skip_error.result@1.7.1.1, 2007-06-20 14:05:48+05:00, holyfoot@mysql.com +19 -0
    Bug #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists.
    
    test result

  mysql-test/t/rpl_skip_error.test@1.7.1.1, 2007-06-20 14:05:48+05:00, holyfoot@mysql.com +19 -0
    Bug #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists.
    
    test case

  sql/log_event.cc@1.174.1.60, 2007-06-20 14:05:48+05:00, holyfoot@mysql.com +1 -0
    Bug #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists.
    
    clear thd->killed state if we ignore the error

ChangeSet@1.1810.3076.1, 2007-06-20 12:25:07+05:00, gshchepa@gleb.loc +5 -0
  Fixed bug #28898.
  For a join query with GROUP BY and/or ORDER BY and a view reference
  in the FROM list the metadata erroneously showed empty table aliases
  and database names for the view columns.
  

  mysql-test/r/metadata.result@1.17, 2007-06-20 12:18:53+05:00, gshchepa@gleb.loc +41 -0
    Updated test case for bug #28898.

  mysql-test/t/metadata.test@1.8, 2007-06-20 12:18:52+05:00, gshchepa@gleb.loc +21 -0
    Updated test case for bug #28898.

  sql/item.cc@1.113.1.160, 2007-06-20 12:18:52+05:00, gshchepa@gleb.loc +15 -0
    Fixed bug #28898.
    The Item_ref::get_tmp_table_item method has been modified
    to copy pointers to the table alias and database name to the new
    Item_field object created for a field stored in the temporary
    table.

  sql/item.h@1.183.1.50, 2007-06-20 12:18:42+05:00, gshchepa@gleb.loc +1 -5
    Fixed bug #28898.
    Body of Item_ref::get_tmp_table_item method has been moved
    to item.cc file.

  sql/sql_select.cc@1.312.160.2, 2007-06-20 12:18:54+05:00, gshchepa@gleb.loc +7 -0
    Fixed bug #28898.
    The change_to_use_tmp_fields function has been modified to
    to copy pointers to the table alias and database name from
    the Item_ref objects to the new Item_field objects created
    for fields stored in the temporary table.

ChangeSet@1.2495.8.5, 2007-06-20 09:54:42+03:00, gkodinov@magare.gmz +2 -0
  removed undeterministic tests introduced by the fix for bug 26418

  mysql-test/r/rpl_innodb.result@1.4, 2007-06-20 09:54:40+03:00, gkodinov@magare.gmz +0 -24
    removed undeterministic tests

  mysql-test/t/rpl_innodb.test@1.5, 2007-06-20 09:54:40+03:00, gkodinov@magare.gmz +0 -4
    removed undeterministic tests

ChangeSet@1.2482.106.2, 2007-06-19 15:37:52+03:00, mhansson@linux-st28.site +1 -0
  Bug #28677: SELECT on missing column gives extra error
  Manual edit in order to merge from mysql-5.0 tree.

  sql/sql_insert.cc@1.272.3.2, 2007-06-19 15:37:47+03:00, mhansson@linux-st28.site +62 -50
    Bug#28677: Manual merge from 5.0:
    - moved everything beyond producing an error message out of select_insert::send_error 
      and into new override select_insert::abort() 
    - made corresponding move of code from select_create::send_error to

ChangeSet@1.2482.107.1, 2007-06-19 14:27:53+03:00, gkodinov@magare.gmz +14 -0
  Bug #26418: Slave out of sync after 
   CREATE/DROP TEMPORARY TABLE + ROLLBACK on master
  
  The transaction ability of the storage engines of
  the tables on the replication master and the replication
  slave must generally be the same.
  When the storage engine type of the slave is 
  non-transactional then transactions on the master that 
  mix update of transactional and non-transactional tables
  should be avoided because they will cause inconsistency of
  the data between the master's transactional table and the
  slave's non-transactional table.
  
  The effect described by this bug is actually expected.
  A detailed test case is added (to be merged later to
  the updated rpl_ddl.test), as there was no coverage 
  by the existing tests. 
  Some code cleanup is also added by this change.

  mysql-test/r/rpl_innodb.result@1.3, 2007-06-19 14:27:52+03:00, gkodinov@magare.gmz +70 -0
    Bug #26418: test case

  mysql-test/t/rpl_innodb.test@1.4, 2007-06-19 14:27:52+03:00, gkodinov@magare.gmz +71 -0
    Bug #26418: test case

  sql/events.cc@1.80, 2007-06-19 14:27:52+03:00, gkodinov@magare.gmz +3 -18
    Bug #26418: replace repeating code with a function call

  sql/sp.cc@1.154.1.1, 2007-06-19 14:27:52+03:00, gkodinov@magare.gmz +2 -14
    Bug #26418: replace repeating code with a function call

  sql/sql_acl.cc@1.236.1.1, 2007-06-19 14:27:52+03:00, gkodinov@magare.gmz +7 -38
    Bug #26418: replace repeating code with a function call

  sql/sql_class.cc@1.335.3.1, 2007-06-19 14:27:52+03:00, gkodinov@magare.gmz +0 -9
    Bug #26418: remove dead code

  sql/sql_class.h@1.366.4.1, 2007-06-19 14:27:52+03:00, gkodinov@magare.gmz +0 -1
    Bug #26418: remove dead code

  sql/sql_delete.cc@1.221.1.1, 2007-06-19 14:27:52+03:00, gkodinov@magare.gmz +5 -10
    Bug #26418: replace repeating code with a function call

  sql/sql_parse.cc@1.677.3.1, 2007-06-19 14:27:52+03:00, gkodinov@magare.gmz +4 -23
    Bug #26418: replace repeating code with a function call

  sql/sql_rename.cc@1.44, 2007-06-19 14:27:52+03:00, gkodinov@magare.gmz +1 -6
    Bug #26418: replace repeating code with a function call

  sql/sql_tablespace.cc@1.11, 2007-06-19 14:27:52+03:00, gkodinov@magare.gmz +1 -5
    Bug #26418: replace repeating code with a function call

  sql/sql_trigger.cc@1.94.1.1, 2007-06-19 14:27:52+03:00, gkodinov@magare.gmz +1 -8
    Bug #26418: replace repeating code with a function call

  sql/sql_udf.cc@1.78, 2007-06-19 14:27:52+03:00, gkodinov@magare.gmz +2 -12
    Bug #26418: replace repeating code with a function call

  sql/sql_view.cc@1.138.2.1, 2007-06-19 14:27:52+03:00, gkodinov@magare.gmz +1 -6
    Bug #26418: replace repeating code with a function call

ChangeSet@1.2495.16.1, 2007-06-19 15:34:21+05:00, bar@mysql.com +1 -0
  mtr_report.pl:
    Ignore warning about file name
    having question marks.

  mysql-test/lib/mtr_report.pl@1.50.1.1, 2007-06-19 15:33:53+05:00, bar@mysql.com +4 -0
    Ignore warning about file name
    having question marks.

ChangeSet@1.1616.3070.1, 2007-06-19 13:19:20+03:00, gkodinov@magare.gmz +2 -0
  Bug #29116: Test "rpl_change_master" returns different 
   counters from relay
  
  Updated the test to return columns vertically.

  mysql-test/r/rpl_change_master.result@1.8.1.3, 2007-06-19 13:19:19+03:00, gkodinov@magare.gmz +66 -4
    Bug #29116: test updated

  mysql-test/t/rpl_change_master.test@1.5.1.6, 2007-06-19 13:19:19+03:00, gkodinov@magare.gmz +2 -2
    Bug #29116: test updated

ChangeSet@1.1616.3069.1, 2007-06-19 11:13:11+05:00, holyfoot@mysql.com +1 -0
  Bug #29117 (init_file test crashes with embedded server)
  
  we use net->vio in my_net_local_init, but in the my_net_init
  implementation we set it after the call, so work with unspecified
  net->vio value

  sql/net_serv.cc@1.63.2.1, 2007-06-19 11:13:10+05:00, holyfoot@mysql.com +1 -1
    Bug #29117 (init_file test crashes with embedded server)
    
    as we started using net->vio in my_net_local_init, we should set
    it before the call

ChangeSet@1.1810.3045.5, 2007-06-19 01:54:35+04:00, anozdrin@ibm. +5 -0
  Fix typo in the patch for BUG#25411 on 24-Apr-2007.

  sql/handler.cc@1.167.34.1, 2007-06-19 01:54:32+04:00, anozdrin@ibm. +1 -1
    Polishing to have the consistent code.

  sql/sp.cc@1.82.1.50, 2007-06-19 01:54:33+04:00, anozdrin@ibm. +1 -1
    Fix typo in the patch for BUG#25411 on 24-Apr-2007.

  sql/sp_head.cc@1.200.7.25, 2007-06-19 01:54:33+04:00, anozdrin@ibm. +2 -2
    Polishing to have the consistent code.

  sql/sql_error.cc@1.36.2.1, 2007-06-19 01:54:33+04:00, anozdrin@ibm. +1 -1
    Polishing to have the consistent code.

  sql/sql_trigger.cc@1.35.1.33, 2007-06-19 01:54:33+04:00, anozdrin@ibm. +1 -1
    Polishing to have the consistent code.

ChangeSet@1.1810.3065.1, 2007-06-18 16:35:01+03:00, mhansson@linux-st28.site +5 -0
  Bug#28677: SELECT on missing column gives extra error
  
  The method select_insert::send_error does two things, it rolls back a statement
  being executed and outputs an error message. But when a 
  nonexistent column is referenced, an error message has been published already and
  there is no need to publish another.
  Fixed by moving all functionality beyond publishing an error message into 
  select_insert::abort() and calling only that function.

  mysql-test/r/errors.result@1.12, 2007-06-18 16:34:59+03:00, mhansson@linux-st28.site +14 -0
    Bug#28677: test result

  mysql-test/t/errors.test@1.18, 2007-06-18 16:34:59+03:00, mhansson@linux-st28.site +13 -0
    Bug#28677: test case

  sql/sql_class.h@1.230.70.1, 2007-06-18 16:34:59+03:00, mhansson@linux-st28.site +1 -0
    Bug#28677: overriding abort()

  sql/sql_insert.cc@1.146.60.1, 2007-06-18 16:34:59+03:00, mhansson@linux-st28.site +51 -41
    Bug#28677: 
    - moved everything beyond producing an error message out of select_insert::send_error 
    and into new override select_insert::abort() 
    - made corresponding move of code from select_create::send_error to select_create::abort

  sql/sql_select.cc@1.312.161.1, 2007-06-18 16:34:59+03:00, mhansson@linux-st28.site +1 -4
    Bug#28677: No need to pusblish an error here

ChangeSet@1.1810.3057.8, 2007-06-17 11:43:49-07:00, igor@olga.mysql.com +1 -0
  Post-merge fix

  mysql-test/r/func_str.result@1.110.1.26, 2007-06-17 11:43:47-07:00, igor@olga.mysql.com +1 -0
    Post-merge fix.

ChangeSet@1.1810.3063.1, 2007-06-17 11:23:19-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #27130. If the third argument of the function SUBSTR was
  represented by an expression of the type UNSIGNED INT and this 
  expression was evaluated to 0 then the function erroneously returned
  the value of the first argument instead of an empty string. 
  
  This problem was introduced by the patch for bug 10963.
  
  The problem has been resolved by a proper modification of the code of
  Item_func_substr::val_str.

  mysql-test/r/func_str.result@1.110.9.1, 2007-06-17 11:23:18-07:00, igor@olga.mysql.com +16 -0
    Added a test case for bug #27130.

  mysql-test/t/func_str.test@1.92.7.1, 2007-06-17 11:23:18-07:00, igor@olga.mysql.com +15 -0
    Added a test case for bug #27130.

  sql/item_strfunc.cc@1.261.1.42, 2007-06-17 11:23:18-07:00, igor@olga.mysql.com +3 -2
    Fixed bug #27130. If the third argument of the function SUBSTR was
    represented by an expression of the type UNSIGNED INT and this 
    expression was evaluated to 0 then the function erroneously returned
    the value of the first argument instead of an empty string. 
    
    This problem was introduced by the patch for bug 10963.
    
    The problem has been resolved by a proper modification of the code of
    Item_func_substr::val_str.

ChangeSet@1.1810.3057.6, 2007-06-16 17:00:29+05:00, gshchepa@gleb.loc +1 -0
  bigint.test:
    Updated test case for bug #28625.

  mysql-test/t/bigint.test@1.29.1.3, 2007-06-16 16:59:30+05:00, gshchepa@gleb.loc +3 -0
    Updated test case for bug #28625.

ChangeSet@1.1810.3061.1, 2007-06-16 13:05:07+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #28625:
  DECIMAL column was used instead of BIGINT for the minimal possible
  BIGINT (-9223372036854775808).
  
  The Item_func_neg::fix_length_and_dec has been adjusted to
  to inherit the type of the argument in the case when it's an 
  Item_int object whose value is equal to LONGLONG_MIN.

  mysql-test/r/bigint.result@1.31.1.5, 2007-06-16 13:04:54+05:00, gshchepa@gleb.loc +26 -0
    Added test case for bug #28625.

  mysql-test/t/bigint.test@1.29.1.2, 2007-06-16 13:04:52+05:00, gshchepa@gleb.loc +13 -0
    Added test result for bug #28625.

  sql/item_func.cc@1.270.70.1, 2007-06-16 13:03:24+05:00, gshchepa@gleb.loc +13 -9
    Fixed bug #28625.
    The Item_func_neg::fix_length_and_dec has been adjusted to
    to inherit the type of the argument in the case when it's an 
    Item_int object whose value is equal to LONGLONG_MIN.

ChangeSet@1.2482.100.7, 2007-06-15 17:22:57-07:00, brian@zim.(none) +4 -0
  Added a test for pre-statement call, and fixed connection/deconnect code so that the rest of bbench can be ran by others. 

  client/client_priv.h@1.72, 2007-06-15 17:22:51-07:00, brian@zim.(none) +4 -0
    Clean up of options.

  client/mysqlslap.c@1.57, 2007-06-15 17:22:51-07:00, brian@zim.(none) +86 -23
    Cleanup of the connection and reconnect code. 

  mysql-test/r/mysqlslap.result@1.12, 2007-06-15 17:22:51-07:00, brian@zim.(none) +44 -0
    Add of new test.

  mysql-test/t/mysqlslap.test@1.16, 2007-06-15 17:22:51-07:00, brian@zim.(none) +2 -0
    Additional test. 

ChangeSet@1.1810.3050.2, 2007-06-15 17:42:03+02:00, msvensson@pilot.(none) +1 -0
  Bug#18415 known problem when mysql-test-run.pl run ActiveState perl for windows
   - Select STDOUT as default handle after having cloned the child
   - Disable check for "$error eq $output" to ptoperly redirect $error 

  mysql-test/lib/mtr_process.pl@1.25.2.30, 2007-06-15 17:42:02+02:00, msvensson@pilot.(none) +3 -13
    Restore output to STDOUT after forking the child
    Since STDOUT is not redirected disable to check to see if $output
    is equal to $error so STDERR is properly opened to $error 

ChangeSet@1.1810.3060.1, 2007-06-15 09:23:27+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#25941 Output warning messages from stdout to stderr when abitrator warnings exist

  ndb/src/mgmsrv/ConfigInfo.cpp@1.60.35.1, 2007-06-15 09:23:22+00:00, lzhou@dev3-63.(none) +2 -2
    Outpout warning to stderr when there are abitrator warnings

ChangeSet@1.1810.3057.4, 2007-06-14 18:55:07-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #27932: the function LOCATE returned NULL if any
  of its arguments was evaluated to NULL, while the predicate
  LOCATE(str,NULL) IS NULL erroneously was evaluated to FALSE.
  
  This happened because the Item_func_locate::fix_length_and_dec
  method by mistake set the value of the maybe_null flag for 
  the function item to 0. In consequence of this the function 
  was considered as the one that could not ever return NULL.

  mysql-test/r/func_str.result@1.110.1.24, 2007-06-14 18:55:05-07:00, igor@olga.mysql.com +76 -0
    Added a test case for bug #27932.

  mysql-test/t/func_str.test@1.92.1.14, 2007-06-14 18:55:05-07:00, igor@olga.mysql.com +33 -0
    Added a test case for bug #27932.

  sql/item_func.cc@1.270.69.1, 2007-06-14 18:55:05-07:00, igor@olga.mysql.com +0 -1
    Fixed bug #27932: the function LOCATE returned NULL if any
    of its arguments was evaluated to NULL, while the predicate
    LOCATE(str,NULL) IS NULL erroneously was evaluated to FALSE.
    
    This happened because the Item_func_locate::fix_length_and_dec
    method by mistake set the value of the maybe_null flag for 
    the function item to 0. In consequence of this the function 
    was considered as the one that could not ever return NULL.

ChangeSet@1.2482.69.7, 2007-06-15 03:22:40+05:00, svoj@mysql.com +3 -0
  BUG#28971 - ALTER TABLE followed by UPDATE for a CSV table
              make server crash
  
  UPDATE against CSV table may cause server crash or update a table with wrong
  values.
  
  CSV can write only a whole row at once. That means it must read all columns,
  that it is not going to update, and write them along with updated columns.
  But only limited set of columns was read, those that were needed for the
  UPDATE query.
  
  With this fix all columns are read in case we're performing an UPDATE.

  mysql-test/r/csv.result@1.19, 2007-06-15 03:22:38+05:00, svoj@mysql.com +8 -0
    A test case for BUG#28971.

  mysql-test/t/csv.test@1.24, 2007-06-15 03:22:38+05:00, svoj@mysql.com +11 -0
    A test case for BUG#28971.
    Flush tables is here just to make crash more probable. If we remove it,
    fields will have old values from previous query and server won't crash.

  storage/csv/ha_tina.cc@1.78, 2007-06-15 03:22:38+05:00, svoj@mysql.com +4 -1
    CSV engine is not capable to update single column,
    because it can only write a row at once. Thus we must
    read all columns if a table is opened for update.

ChangeSet@1.2482.95.4, 2007-06-13 17:28:59+02:00, mikael@dator6.(none) +11 -0
  Disabled ascii-function

  mysql-test/r/partition_bug18198.result@1.3, 2007-06-13 17:28:57+02:00, mikael@dator6.(none) +0 -30
    Disabled a lot of test cases using ascii-function

  mysql-test/r/partition_charset.result@1.3, 2007-06-13 17:28:57+02:00, mikael@dator6.(none) +1 -3
    Disabled a lot of test cases using ascii-function

  mysql-test/r/partition_error.result@1.15, 2007-06-13 17:28:57+02:00, mikael@dator6.(none) +1 -1
    Disabled a lot of test cases using ascii-function

  mysql-test/r/partition_pruning.result@1.25, 2007-06-13 17:28:57+02:00, mikael@dator6.(none) +0 -18
    Disabled a lot of test cases using ascii-function

  mysql-test/r/partition_range.result@1.22, 2007-06-13 17:28:57+02:00, mikael@dator6.(none) +0 -76
    Disabled a lot of test cases using ascii-function

  mysql-test/t/partition_bug18198.test@1.3, 2007-06-13 17:28:57+02:00, mikael@dator6.(none) +0 -33
    Disabled a lot of test cases using ascii-function

  mysql-test/t/partition_charset.test@1.3, 2007-06-13 17:28:57+02:00, mikael@dator6.(none) +4 -3
    Disabled a lot of test cases using ascii-function

  mysql-test/t/partition_error.test@1.17, 2007-06-13 17:28:57+02:00, mikael@dator6.(none) +2 -1
    Disabled a lot of test cases using ascii-function

  mysql-test/t/partition_pruning.test@1.21, 2007-06-13 17:28:57+02:00, mikael@dator6.(none) +11 -11
    Disabled a lot of test cases using ascii-function

  mysql-test/t/partition_range.test@1.18, 2007-06-13 17:28:57+02:00, mikael@dator6.(none) +63 -65
    Disabled a lot of test cases using ascii-function

  sql/item_func.h@1.166, 2007-06-13 17:28:57+02:00, mikael@dator6.(none) +0 -1
    Disabled ascii-function

ChangeSet@1.2482.95.3, 2007-06-13 16:40:29+02:00, mikael@dator6.(none) +1 -0
  Already fixed by bug27123 fix

  sql/sql_partition.cc@1.106.1.2, 2007-06-13 16:40:28+02:00, mikael@dator6.(none) +3 -6
    Already fixed by bug27123 fix

ChangeSet@1.2482.95.2, 2007-06-13 16:12:02+02:00, mikael@dator6.(none) +3 -0
  manual merge

  sql/item.h@1.245.1.2, 2007-06-13 16:12:00+02:00, mikael@dator6.(none) +3 -3
    manual merge

  sql/item_func.h@1.165, 2007-06-13 16:12:00+02:00, mikael@dator6.(none) +4 -4
    manual merge

  sql/item_timefunc.h@1.88, 2007-06-13 16:12:00+02:00, mikael@dator6.(none) +2 -2
    manual merge

ChangeSet@1.2482.42.1, 2007-05-29 21:07:48+03:00, monty@mysql.com +3 -0
  Added casts to remove compiler warnings on windows
  Give warnings also for safe_mutex errors found by test system
  Added some warnings from different machines in pushbuild

  mysql-test/lib/mtr_report.pl@1.47.1.2, 2007-05-29 21:07:46+03:00, monty@mysql.com +15 -8
    Give warnings also for safe_mutex errors
    Added some warnings from different machines in pushbuild

  mysys/my_compress.c@1.17, 2007-05-29 21:07:46+03:00, monty@mysql.com +2 -2
    Added casts to remove compiler warnings on windows

  sql/sql_class.cc@1.336, 2007-05-29 21:07:46+03:00, monty@mysql.com +1 -1
    Added cast to remove compiler warnings on windows

ChangeSet@1.2482.18.8, 2007-05-29 19:46:48+03:00, jani@hynda.mysql.fi +3 -0
  Disabled compiler warnings mainly for Win 64.

  mysys/my_conio.c@1.5, 2007-05-29 19:46:45+03:00, jani@hynda.mysql.fi +4 -2
    To avoid a warning from compiler.

  sql/ha_partition.cc@1.93, 2007-05-29 19:46:45+03:00, jani@hynda.mysql.fi +1 -1
    result is type bool, so calculation should be forced to
    that also.

  support-files/compiler_warnings.supp@1.12, 2007-05-29 19:46:45+03:00, jani@hynda.mysql.fi +8 -1
    Added new disabled warnings for Win 64.

ChangeSet@1.2482.18.7, 2007-05-29 16:47:11+03:00, monty@mysql.com +9 -0
  Don't give warning that readonly variable is forced to be readonly
  mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
  Fixed wrong reference to the mysql manual
  Fixed wrong prototype that caused some tests to fail on 64 bit platforms

  mysql-test/lib/mtr_report.pl@1.47.1.1, 2007-05-29 16:47:09+03:00, monty@mysql.com +58 -6
    Test run now fails if we have [Warning] and [ERROR] as tags in .err file
    Added list of all common 'not fatal' errors to ignore error list

  mysql-test/mysql-test-run-shell.sh@1.341, 2007-05-29 16:47:09+03:00, monty@mysql.com +7 -2
    Fixed some wrong startup options

  mysql-test/t/disabled.def@1.253.3.1, 2007-05-29 16:47:09+03:00, monty@mysql.com +3 -0
    Disable instance manager tests because they generate warnings (and probably don't read the option files correctly)

  sql/ha_ndbcluster_binlog.cc@1.120, 2007-05-29 16:47:09+03:00, monty@mysql.com +10 -10
    Ensure we log all binglog errors with the "NDB Binlog" tag

  sql/slave.cc@1.309, 2007-05-29 16:47:09+03:00, monty@mysql.com +2 -2
    Make errors uniform

  sql/sql_plugin.cc@1.68, 2007-05-29 16:47:09+03:00, monty@mysql.com +2 -2
    Don't give warning that readonly variable is forced to be readonly

  sql/stacktrace.c@1.29, 2007-05-29 16:47:09+03:00, monty@mysql.com +5 -3
    Corrected manual reference

  storage/blackhole/ha_blackhole.cc@1.53, 2007-05-29 16:47:09+03:00, monty@mysql.com +2 -2
    Fixed wrong prototype that caused test to fail on 64 bit platforms

  storage/example/ha_example.cc@1.58, 2007-05-29 16:47:09+03:00, monty@mysql.com +1 -1
    Fixed wrong prototype that caused test to fail on 64 bit platforms

ChangeSet@1.2482.34.1, 2007-05-29 09:26:53+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +5 -0
  Added casts and fixed wrong type.

  client/mysqltest.c@1.301.1.1, 2007-05-29 09:26:47+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +16 -12
    Added casts to avoid compiler warnings.

  mysys/my_quick.c@1.7.1.1, 2007-05-29 09:26:47+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Added cast to avoid compiler warning.

  sql/log.cc@1.283, 2007-05-29 09:26:47+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Fixed compiler problem on Solaris.

  sql/sql_map.cc@1.20.1.1, 2007-05-29 09:26:47+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -2
    Added casts to avoid compiler warnings.

  strings/ctype-ucs2.c@1.69.1.1, 2007-05-29 09:26:47+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +3 -3
    Fixed wrong type.

ChangeSet@1.2482.18.5, 2007-05-29 08:22:38+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +4 -0
  Added casts and fixed wrong type.

  client/mysqltest.c@1.302, 2007-05-29 08:22:33+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +16 -12
    Added casts to avoid compiler warnings.

  mysys/my_quick.c@1.8, 2007-05-29 08:22:33+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Added cast to avoid compiler warning.

  sql/sql_map.cc@1.21, 2007-05-29 08:22:33+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -2
    Added casts to avoid compiler warnings.

  strings/ctype-ucs2.c@1.70, 2007-05-29 08:22:33+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +3 -3
    Fixed wrong type.

ChangeSet@1.2482.18.4, 2007-05-28 19:58:06+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +3 -0
  Added casts to avoid compiler warnings and fixed a wrong type.

  mysys/array.c@1.19, 2007-05-28 19:58:00+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +9 -9
    Added casts to avoid compiler warnings.

  mysys/hash.c@1.56, 2007-05-28 19:58:00+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +5 -3
    Added casts to avoid compiler warnings.

  sql/sql_plugin.cc@1.67, 2007-05-28 19:58:00+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Fixed wrong type.

ChangeSet@1.2469.130.10, 2007-04-20 18:46:12+02:00, mikael@dator3.(none) +2 -0
  Removed warnings

  mysql-test/r/partition_bug18198.result@1.2, 2007-04-20 18:46:10+02:00, mikael@dator3.(none) +0 -2
    Removed warnings

  mysql-test/t/partition_bug18198.test@1.2, 2007-04-20 18:46:10+02:00, mikael@dator3.(none) +2 -2
    Removed warnings

ChangeSet@1.2469.130.9, 2007-04-20 18:35:16+02:00, mikael@dator3.(none) +5 -0
  BUG#18198
  Added new test cases, fixed bugs in relation to those

  mysql-test/r/partition_charset.result@1.2, 2007-04-20 18:35:13+02:00, mikael@dator3.(none) +6 -0
    New test case

  mysql-test/r/partition_list.result@1.7, 2007-04-20 18:35:13+02:00, mikael@dator3.(none) +4 -0
    New test case

  mysql-test/t/partition_list.test@1.8, 2007-04-20 18:35:13+02:00, mikael@dator3.(none) +1 -1
    New test case

  sql/partition_info.cc@1.34.3.2, 2007-04-20 18:35:13+02:00, mikael@dator3.(none) +1 -0
    Missing initialisation

  sql/sql_partition.cc@1.100.2.3, 2007-04-20 18:35:13+02:00, mikael@dator3.(none) +12 -3
    key_restore made use of field->ptr in VARCHAR fields and
    when used with REPLACE it caused the key_restore to
    become against table->record[0] when buf pointed to
    table->record[1]

ChangeSet@1.2469.172.1, 2007-04-12 20:34:36+02:00, mikron@mikael-ronstr-ms-dator.local +4 -0
  More test cases

  mysql-test/r/partition_bug18198.result@1.1, 2007-04-12 20:32:49+02:00, mikron@mikael-ronstr-ms-dator.local +205 -0
    New test case

  mysql-test/r/partition_bug18198.result@1.0, 2007-04-12 20:32:49+02:00, mikron@mikael-ronstr-ms-dator.local +0 -0

  mysql-test/t/partition_bug18198.test@1.1, 2007-04-12 20:32:49+02:00, mikron@mikael-ronstr-ms-dator.local +252 -0
    New test case

  mysql-test/t/partition_bug18198.test@1.0, 2007-04-12 20:32:49+02:00, mikron@mikael-ronstr-ms-dator.local +0 -0

  mysql-test/t/partition_charset.test@1.2, 2007-04-12 20:32:48+02:00, mikron@mikael-ronstr-ms-dator.local +7 -0
    New test case from bug report

  mysql-test/t/partition_list.test@1.7, 2007-04-12 20:32:49+02:00, mikron@mikael-ronstr-ms-dator.local +4 -0
    New test case from bug report

ChangeSet@1.2469.130.7, 2007-04-06 14:10:37+02:00, mikael@dator3.(none) +1 -0
  merge error

  mysql-test/r/partition_pruning.result@1.24, 2007-04-06 14:10:34+02:00, mikael@dator3.(none) +1 -1
    merge error

ChangeSet@1.2409.112.1, 2007-04-04 16:26:32+02:00, mikron@mikael-ronstr-ms-dator.local +19 -0
  Reapplied patch for bug18198

  mysql-test/r/partition_error.result@1.14, 2007-04-04 16:26:24+02:00, mikron@mikael-ronstr-ms-dator.local +4 -4
    Reapplied patch for bug18198

  mysql-test/r/partition_hash.result@1.7, 2007-04-04 16:26:24+02:00, mikron@mikael-ronstr-ms-dator.local +0 -14
    Reapplied patch for bug18198

  mysql-test/r/partition_mgm.result@1.9, 2007-04-04 16:26:24+02:00, mikron@mikael-ronstr-ms-dator.local +3 -3
    Reapplied patch for bug18198

  mysql-test/r/partition_pruning.result@1.23, 2007-04-04 16:26:24+02:00, mikron@mikael-ronstr-ms-dator.local +46 -12
    Reapplied patch for bug18198

  mysql-test/r/partition_range.result@1.21, 2007-04-04 16:26:24+02:00, mikron@mikael-ronstr-ms-dator.local +17 -17
    Reapplied patch for bug18198

  mysql-test/t/partition_error.test@1.16, 2007-04-04 16:26:24+02:00, mikron@mikael-ronstr-ms-dator.local +4 -4
    Reapplied patch for bug18198

  mysql-test/t/partition_hash.test@1.7, 2007-04-04 16:26:24+02:00, mikron@mikael-ronstr-ms-dator.local +0 -12
    Reapplied patch for bug18198

  mysql-test/t/partition_mgm.test@1.8, 2007-04-04 16:26:24+02:00, mikron@mikael-ronstr-ms-dator.local +1 -1
    Reapplied patch for bug18198

  mysql-test/t/partition_pruning.test@1.20, 2007-04-04 16:26:24+02:00, mikron@mikael-ronstr-ms-dator.local +44 -18
    Reapplied patch for bug18198

  mysql-test/t/partition_range.test@1.17, 2007-04-04 16:26:25+02:00, mikron@mikael-ronstr-ms-dator.local +13 -13
    Reapplied patch for bug18198

  sql/item.h@1.224.2.1, 2007-04-04 16:26:25+02:00, mikron@mikael-ronstr-ms-dator.local +8 -10
    Reapplied patch for bug18198

  sql/item_cmpfunc.h@1.146.1.1, 2007-04-04 16:26:25+02:00, mikron@mikael-ronstr-ms-dator.local +0 -14
    Reapplied patch for bug18198

  sql/item_func.h@1.161.3.1, 2007-04-04 16:26:25+02:00, mikron@mikael-ronstr-ms-dator.local +4 -27
    Reapplied patch for bug18198

  sql/item_strfunc.h@1.125.1.1, 2007-04-04 16:26:25+02:00, mikron@mikael-ronstr-ms-dator.local +0 -14
    Reapplied patch for bug18198

  sql/item_timefunc.h@1.80.1.1, 2007-04-04 16:26:25+02:00, mikron@mikael-ronstr-ms-dator.local +2 -15
    Reapplied patch for bug18198

  sql/item_xmlfunc.h@1.8, 2007-04-04 16:26:25+02:00, mikron@mikael-ronstr-ms-dator.local +0 -1
    Reapplied patch for bug18198

  sql/partition_info.cc@1.34.3.1, 2007-04-04 16:26:25+02:00, mikron@mikael-ronstr-ms-dator.local +16 -27
    Reapplied patch for bug18198

  sql/sql_partition.cc@1.99.1.1, 2007-04-04 16:26:25+02:00, mikron@mikael-ronstr-ms-dator.local +2 -0
    Reapplied patch for bug18198

  sql/sql_yacc.yy@1.534.7.1, 2007-04-04 16:26:25+02:00, mikron@mikael-ronstr-ms-dator.local +1 -2
    Reapplied patch for bug18198

ChangeSet@1.2469.78.1, 2007-03-27 16:15:38+05:00, holyfoot@mysql.com +7 -0
  Bug #27084 partitioning by list seems failing when using case
  
  creation of the partitioned table could fail as we created Item-s for
  it's list function in thd->mem_root, and then do Item->fix_fields
  in the context of other table->mem_root (so that memory alloced
  there was alloced in this table->mem_root). As we freed the
  table->mem_root before we do thd->free_items, our Item-s had
  pointers to the freed memory, that caused the crash

  mysql-test/r/partition.result@1.58.1.1, 2007-03-27 16:15:34+05:00, holyfoot@mysql.com +10 -0
    result

  mysql-test/t/partition.test@1.52.1.1, 2007-03-27 16:15:34+05:00, holyfoot@mysql.com +15 -0
    testcase

  sql/item_cmpfunc.cc@1.257.1.1, 2007-03-27 16:15:35+05:00, holyfoot@mysql.com +15 -0
    here is better place for the implementation

  sql/item_cmpfunc.h@1.158, 2007-03-27 16:15:35+05:00, holyfoot@mysql.com +1 -12
    implementation moved to .cc file

  sql/sql_partition.cc@1.100.1.1, 2007-03-27 16:15:35+05:00, holyfoot@mysql.com +6 -1
    work_part_info_used parameter added to mysql_unpack_partition

  sql/sql_partition.h@1.14, 2007-03-27 16:15:35+05:00, holyfoot@mysql.com +2 -1
    work_part_info_used parameter added to mysql_unpack_partition

  sql/table.cc@1.281.1.1, 2007-03-27 16:15:35+05:00, holyfoot@mysql.com +11 -2
    we do 'fix_partition_func' using the proper arena now.
    It's necessary as Item_*::fix_fields can alloc memory
    using thd->mem_root and this has to be same mem_root that
    we used to alloc these Item-s

