mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
77199 commits 2788 branches 343 tags 1.7 GiB
Commit graph

64 commits

Author SHA1 Message Date
Michael Widenius
a260b15554 MDEV-4011 Added per thread memory counting and usage 
Base code and idea from a patch from by plinux at Taobao.

The idea is that we mark all memory that are thread specific with MY_THREAD_SPECIFIC.
Memory counting is done per thread in the my_malloc_size_cb_func callback function from my_malloc().
There are plenty of new asserts to ensure that for a debug server the counting is correct.

Information_schema.processlist gets two new columns: MEMORY_USED and EXAMINED_ROWS.
- The later is there mainly to show how query is progressing.

The following changes in interfaces was needed to get this to work:
- init_alloc_root() amd init_sql_alloc() has extra option so that one can mark memory with MY_THREAD_SPECIFIC
- One now have to use alloc_root_set_min_malloc() to set min memory to be allocated by alloc_root()
- my_init_dynamic_array()  has extra option so that one can mark memory with MY_THREAD_SPECIFIC
- my_net_init() has extra option so that one can mark memory with MY_THREAD_SPECIFIC
- Added flag for hash_init() so that one can mark hash table to be thread specific.
- Added flags to init_tree() so that one can mark tree to be thread specific.
- Removed with_delete option to init_tree(). Now one should instead use MY_TREE_WITH_DELETE_FLAG.
- Added flag to Warning_info::Warning_info() if the structure should be fully initialized.
- String elements can now be marked as thread specific.
- Internal HEAP tables are now marking it's memory as MY_THREAD_SPECIFIC.
- Changed type of myf from int to ulong, as this is always a set of bit flags.

Other things:
- Removed calls to net_end() and thd->cleanup() as these are now done in ~THD()
- We now also show EXAMINED_ROWS in SHOW PROCESSLIST
- Added new variable 'memory_used'
- Fixed bug where kill_threads_for_user() was using the wrong mem_root to allocate memory.
- Removed calls to the obsoleted function init_dynamic_array()
- Use set_current_thd() instead of my_pthread_setspecific_ptr(THR_THD,...)


client/completion_hash.cc:
  Updated call to init_alloc_root()
client/mysql.cc:
  Updated call to init_alloc_root()
client/mysqlbinlog.cc:
  init_dynamic_array() -> my_init_dynamic_array()
  Updated call to init_alloc_root()
client/mysqlcheck.c:
  Updated call to my_init_dynamic_array()
client/mysqldump.c:
  Updated call to init_alloc_root()
client/mysqltest.cc:
  Updated call to init_alloc_root()
  Updated call to my_init_dynamic_array()
  Fixed compiler warnings
extra/comp_err.c:
  Updated call to my_init_dynamic_array()
extra/resolve_stack_dump.c:
  Updated call to my_init_dynamic_array()
include/hash.h:
  Added HASH_THREAD_SPECIFIC
include/heap.h:
  Added flag is internal temporary table.
include/my_dir.h:
  Safety fix: Ensure that MY_DONT_SORT and MY_WANT_STAT don't interfer with other mysys flags
include/my_global.h:
  Changed type of myf from int to ulong, as this is always a set of bit flags.
include/my_sys.h:
  Added MY_THREAD_SPECIFIC and MY_THREAD_MOVE
  Added malloc_flags to DYNAMIC_ARRAY
  Added extra mysys flag argument to my_init_dynamic_array()
  Removed deprecated functions init_dynamic_array() and my_init_dynamic_array.._ci
  Updated paramaters for init_alloc_root()
include/my_tree.h:
  Added my_flags to allow one to use MY_THREAD_SPECIFIC with hash tables.
  Removed with_delete. One should now instead use MY_TREE_WITH_DELETE_FLAG
  Updated parameters to init_tree()
include/myisamchk.h:
  Added malloc_flags to allow one to use MY_THREAD_SPECIFIC for checks.
include/mysql.h:
  Added MYSQL_THREAD_SPECIFIC_MALLOC
  Used 'unused1' to mark memory as thread specific.
include/mysql.h.pp:
  Updated file
include/mysql_com.h:
  Used 'unused1' to mark memory as thread specific.
  Updated parameters for my_net_init()
libmysql/libmysql.c:
  Updated call to init_alloc_root() to mark memory thread specific.
libmysqld/emb_qcache.cc:
  Updated call to init_alloc_root()
libmysqld/lib_sql.cc:
  Updated call to init_alloc_root()
mysql-test/r/create.result:
  Updated results
mysql-test/r/user_var.result:
  Updated results
mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
  Update to handle new format of SHOW PROCESSLIST
mysql-test/suite/funcs_1/datadict/processlist_val.inc:
  Update to handle new format of SHOW PROCESSLIST
mysql-test/suite/funcs_1/r/is_columns_is.result:
  Update to handle new format of SHOW PROCESSLIST
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result:
  Updated results
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
  Updated results
mysql-test/t/show_explain.test:
  Fixed usage of debug variable so that one can run test with --debug
mysql-test/t/user_var.test:
  Added test of memory_usage variable.
mysys/array.c:
  Added extra my_flags option to init_dynamic_array() and init_dynamic_array2() so that one can mark memory with MY_THREAD_SPECIFIC
  All allocated memory is marked with the given my_flags.
  Removed obsolete function init_dynamic_array()
mysys/default.c:
  Updated call to init_alloc_root()
  Updated call to my_init_dynamic_array()
mysys/hash.c:
  Updated call to my_init_dynamic_array_ci().
  Allocated memory is marked with MY_THREAD_SPECIFIC if HASH_THREAD_SPECIFIC is used.
mysys/ma_dyncol.c:
  init_dynamic_array() -> my_init_dynamic_array()
  Added #if to get rid of compiler warnings
mysys/mf_tempdir.c:
  Updated call to my_init_dynamic_array()
mysys/my_alloc.c:
  Added extra parameter to init_alloc_root() so that one can mark memory with MY_THREAD_SPECIFIC
  Extend MEM_ROOT with a flag if memory is thread specific.
  This is stored in block_size, to keep the size of the MEM_ROOT object identical as before.
  Allocated memory is marked with MY_THREAD_SPECIFIC if used with init_alloc_root()
mysys/my_chmod.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_chsize.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_copy.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_create.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_delete.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_error.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_fopen.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_fstream.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_getwd.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_lib.c:
  Updated call to init_alloc_root()
  Updated call to my_init_dynamic_array()
  Updated DBUG_PRINT because of change of myf type
mysys/my_lock.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_malloc.c:
  Store at start of each allocated memory block the size of the block and if the block is thread specific.
  Call malloc_size_cb_func, if set, with the memory allocated/freed.
  Updated DBUG_PRINT because of change of myf type
mysys/my_open.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_pread.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_read.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_redel.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_rename.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_seek.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_sync.c:
  Updated DBUG_PRINT because of change of myf type
mysys/my_thr_init.c:
  Ensure that one can call my_thread_dbug_id() even if thread is not properly initialized.
mysys/my_write.c:
  Updated DBUG_PRINT because of change of myf type
mysys/mysys_priv.h:
  Updated parameters to sf_malloc and sf_realloc()
mysys/safemalloc.c:
  Added checking that for memory marked with MY_THREAD_SPECIFIC that it's the same thread that is allocation and freeing the memory.
  Added sf_malloc_dbug_id() to allow MariaDB to specify which THD is handling the memory.
  Added my_flags arguments to sf_malloc() and sf_realloc() to be able to mark memory with MY_THREAD_SPECIFIC.
  Added sf_report_leaked_memory() to get list of memory not freed by a thread.
mysys/tree.c:
  Added flags to init_tree() so that one can mark tree to be thread specific.
  Removed with_delete option to init_tree(). Now one should instead use MY_TREE_WITH_DELETE_FLAG.
  Updated call to init_alloc_root()
  All allocated memory is marked with the given malloc flags
mysys/waiting_threads.c:
  Updated call to my_init_dynamic_array()
sql-common/client.c:
  Updated call to init_alloc_root() and my_net_init() to mark memory thread specific.
  Updated call to my_init_dynamic_array().
  Added MYSQL_THREAD_SPECIFIC_MALLOC so that client can mark memory as MY_THREAD_SPECIFIC.
sql-common/client_plugin.c:
  Updated call to init_alloc_root()
sql/debug_sync.cc:
  Added MY_THREAD_SPECIFIC to allocated memory.
sql/event_scheduler.cc:
  Removed calls to net_end() as this is now done in ~THD()
  Call set_current_thd() to ensure that memory is assigned to right thread.
sql/events.cc:
  my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd()
sql/filesort.cc:
  Added MY_THREAD_SPECIFIC to allocated memory.
sql/filesort_utils.cc:
  Added MY_THREAD_SPECIFIC to allocated memory.
sql/ha_ndbcluster.cc:
  Updated call to init_alloc_root()
  Updated call to my_net_init()
  Removed calls to net_end() and thd->cleanup() as these are now done in ~THD()
sql/ha_ndbcluster_binlog.cc:
  Updated call to my_net_init()
  Updated call to init_sql_alloc()
  Removed calls to net_end() and thd->cleanup() as these are now done in ~THD()
sql/ha_partition.cc:
  Updated call to init_alloc_root()
sql/handler.cc:
  Added MY_THREAD_SPECIFIC to allocated memory.
  Added missing call to my_dir_end()
sql/item_func.cc:
  Added MY_THREAD_SPECIFIC to allocated memory.
sql/item_subselect.cc:
  Added MY_THREAD_SPECIFIC to allocated memory.
sql/item_sum.cc:
  Added MY_THREAD_SPECIFIC to allocated memory.
sql/log.cc:
  More DBUG
  Updated call to init_alloc_root()
sql/mdl.cc:
  Added MY_THREAD_SPECIFIC to allocated memory.
sql/mysqld.cc:
  Added total_memory_used
  Updated call to init_alloc_root()
  Move mysql_cond_broadcast() before my_thread_end()
  Added mariadb_dbug_id() to count memory per THD instead of per thread.
  Added my_malloc_size_cb_func() callback function for my_malloc() to count memory.
  Move initialization of mysqld_server_started and mysqld_server_initialized earlier.
  Updated call to my_init_dynamic_array().
  Updated call to my_net_init().
  Call my_pthread_setspecific_ptr(THR_THD,...) to ensure that memory is assigned to right thread.
  Added status variable 'memory_used'.
  Updated call to init_alloc_root()
  my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd()
sql/mysqld.h:
  Added set_current_thd()
sql/net_serv.cc:
  Added new parameter to my_net_init() so that one can mark memory with MY_THREAD_SPECIFIC.
  Store in net->thread_specific_malloc if memory is thread specific.
  Mark memory to be thread specific if requested.
sql/opt_range.cc:
  Updated call to my_init_dynamic_array()
  Updated call to init_sql_alloc()
  Added MY_THREAD_SPECIFIC to allocated memory.
sql/opt_subselect.cc:
  Updated call to init_sql_alloc() to mark memory thread specific.
sql/protocol.cc:
  Fixed compiler warning
sql/records.cc:
  Added MY_THREAD_SPECIFIC to allocated memory.
sql/rpl_filter.cc:
  Updated call to my_init_dynamic_array()
sql/rpl_handler.cc:
  Updated call to my_init_dynamic_array2()
sql/rpl_handler.h:
  Updated call to init_sql_alloc()
sql/rpl_mi.cc:
  Updated call to my_init_dynamic_array()
sql/rpl_tblmap.cc:
  Updated call to init_alloc_root()
sql/rpl_utility.cc:
  Updated call to my_init_dynamic_array()
sql/slave.cc:
  Initialize things properly before calling functions that allocate memory.
  Removed calls to net_end() as this is now done in ~THD()
sql/sp_head.cc:
  Updated call to init_sql_alloc()
  Updated call to my_init_dynamic_array()
  Added parameter to warning_info() that it should be fully initialized.
sql/sp_pcontext.cc:
  Updated call to my_init_dynamic_array()
sql/sql_acl.cc:
  Updated call to init_sql_alloc()
  Updated call to my_init_dynamic_array()
  my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd()
sql/sql_admin.cc:
  Added parameter to warning_info() that it should be fully initialized.
sql/sql_analyse.h:
  Updated call to init_tree() to mark memory thread specific.
sql/sql_array.h:
  Updated call to my_init_dynamic_array() to mark memory thread specific.
sql/sql_audit.cc:
  Updated call to my_init_dynamic_array()
sql/sql_base.cc:
  Updated call to init_sql_alloc()
  my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd()
sql/sql_cache.cc:
  Updated comment
sql/sql_class.cc:
  Added parameter to warning_info() that not initialize it until THD is fully created.
  Updated call to init_sql_alloc()
  Mark THD::user_vars has to be thread specific.
  Updated call to my_init_dynamic_array()
  Ensure that memory allocated by THD is assigned to the THD.
  More DBUG
  Always acll net_end() in ~THD()
  Assert that all memory signed to this THD is really deleted at ~THD.
  Fixed set_status_var_init() to not reset memory_used.
  my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd()
sql/sql_class.h:
  Added MY_THREAD_SPECIFIC to allocated memory.
  Added malloc_size to THD to record allocated memory per THD.
sql/sql_delete.cc:
  Added MY_THREAD_SPECIFIC to allocated memory.
sql/sql_error.cc:
  Added 'initialize' parameter to Warning_info() to say if should allocate memory for it's structures.
  This is used by THD::THD() to not allocate memory until THD is ready.
  Added Warning_info::free_memory()
sql/sql_error.h:
  Updated Warning_info() class.
sql/sql_handler.cc:
  Updated call to init_alloc_root() to mark memory thread specific.
sql/sql_insert.cc:
  More DBUG
sql/sql_join_cache.cc:
  Added MY_THREAD_SPECIFIC to allocated memory.
sql/sql_lex.cc:
  Updated call to my_init_dynamic_array()
sql/sql_lex.h:
  Updated call to my_init_dynamic_array()
sql/sql_load.cc:
  Added MY_THREAD_SPECIFIC to allocated memory.
sql/sql_parse.cc:
  Removed calls to net_end() and thd->cleanup() as these are now done in ~THD()
  Ensure that examined_row_count() is reset before query.
  Fixed bug where kill_threads_for_user() was using the wrong mem_root to allocate memory.
  my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd()
  Don't restore thd->status_var.memory_used when restoring thd->status_var
sql/sql_plugin.cc:
  Updated call to init_alloc_root()
  Updated call to my_init_dynamic_array()
  Don't allocate THD on the stack, as this causes problems with valgrind when doing thd memory counting.
  my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd()
sql/sql_prepare.cc:
  Added parameter to warning_info() that it should be fully initialized.
  Updated call to init_sql_alloc() to mark memory thread specific.
sql/sql_reload.cc:
  my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd()
sql/sql_select.cc:
  Updated call to my_init_dynamic_array() and init_sql_alloc() to mark memory thread specific.
  Added MY_THREAD_SPECIFIC to allocated memory.
  More DBUG
sql/sql_servers.cc:
  Updated call to init_sql_alloc() to mark memory some memory thread specific.
  my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd()
sql/sql_show.cc:
  Updated call to my_init_dynamic_array()
  Mark my_dir() memory thread specific.
  Use my_pthread_setspecific_ptr(THR_THD,...) to mark that allocated memory should be allocated to calling thread.
  More DBUG.
  Added malloc_size and examined_row_count to SHOW PROCESSLIST.
  Added MY_THREAD_SPECIFIC to allocated memory.
  Updated call to init_sql_alloc()
  Added parameter to warning_info() that it should be fully initialized.
sql/sql_statistics.cc:
  Fixed compiler warning
sql/sql_string.cc:
  String elements can now be marked as thread specific.
sql/sql_string.h:
  String elements can now be marked as thread specific.
sql/sql_table.cc:
  Updated call to init_sql_alloc() and my_malloc() to mark memory thread specific
  my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd()
  Fixed compiler warning
sql/sql_test.cc:
  Updated call to my_init_dynamic_array() to mark memory thread specific.
sql/sql_trigger.cc:
  Updated call to init_sql_alloc()
sql/sql_udf.cc:
  Updated call to init_sql_alloc()
  my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd()
sql/sql_update.cc:
  Added MY_THREAD_SPECIFIC to allocated memory.
sql/table.cc:
  Updated call to init_sql_alloc().
  Mark memory used by temporary tables, that are not for slave threads, as MY_THREAD_SPECIFIC
  Updated call to init_sql_alloc()
sql/thr_malloc.cc:
  Added my_flags argument to init_sql_alloc() to be able to mark memory as MY_THREAD_SPECIFIC.
sql/thr_malloc.h:
  Updated prototype for init_sql_alloc()
sql/tztime.cc:
  Updated call to init_sql_alloc()
  Updated call to init_alloc_root() to mark memory thread specific.
  my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd()
sql/uniques.cc:
  Updated calls to init_tree(), my_init_dynamic_array() and my_malloc() to mark memory thread specific.
sql/unireg.cc:
  Added MY_THREAD_SPECIFIC to allocated memory.
storage/csv/ha_tina.cc:
  Updated call to init_alloc_root()
storage/federated/ha_federated.cc:
  Updated call to init_alloc_root()
  Updated call to my_init_dynamic_array()
  Ensure that memory allocated by fedarated is registered for the system, not for the thread.
storage/federatedx/federatedx_io_mysql.cc:
  Updated call to my_init_dynamic_array()
storage/federatedx/ha_federatedx.cc:
  Updated call to init_alloc_root()
  Updated call to my_init_dynamic_array()
storage/heap/ha_heap.cc:
  Added MY_THREAD_SPECIFIC to allocated memory.
storage/heap/heapdef.h:
  Added parameter to hp_get_new_block() to be able to do thread specific memory tagging.
storage/heap/hp_block.c:
  Added parameter to hp_get_new_block() to be able to do thread specific memory tagging.
storage/heap/hp_create.c:
  - Internal HEAP tables are now marking it's memory as MY_THREAD_SPECIFIC.
  - Use MY_TREE_WITH_DELETE instead of removed option 'with_delete'.
storage/heap/hp_open.c:
  Internal HEAP tables are now marking it's memory as MY_THREAD_SPECIFIC.
storage/heap/hp_write.c:
  Added new parameter to hp_get_new_block()
storage/maria/ma_bitmap.c:
  Updated call to my_init_dynamic_array()
storage/maria/ma_blockrec.c:
  Updated call to my_init_dynamic_array()
storage/maria/ma_check.c:
  Updated call to init_alloc_root()
storage/maria/ma_ft_boolean_search.c:
  Updated calls to init_tree() and init_alloc_root()
storage/maria/ma_ft_nlq_search.c:
  Updated call to init_tree()
storage/maria/ma_ft_parser.c:
  Updated call to init_tree()
  Updated call to init_alloc_root()
storage/maria/ma_loghandler.c:
  Updated call to my_init_dynamic_array()
storage/maria/ma_open.c:
  Updated call to my_init_dynamic_array()
storage/maria/ma_sort.c:
  Updated call to my_init_dynamic_array()
storage/maria/ma_write.c:
  Updated calls to my_init_dynamic_array() and init_tree()
storage/maria/maria_pack.c:
  Updated call to init_tree()
storage/maria/unittest/sequence_storage.c:
  Updated call to my_init_dynamic_array()
storage/myisam/ft_boolean_search.c:
  Updated call to init_tree()
  Updated call to init_alloc_root()
storage/myisam/ft_nlq_search.c:
  Updated call to init_tree()
storage/myisam/ft_parser.c:
  Updated call to init_tree()
  Updated call to init_alloc_root()
storage/myisam/ft_stopwords.c:
  Updated call to init_tree()
storage/myisam/mi_check.c:
  Updated call to init_alloc_root()
storage/myisam/mi_write.c:
  Updated call to my_init_dynamic_array()
  Updated call to init_tree()
storage/myisam/myisamlog.c:
  Updated call to init_tree()
storage/myisam/myisampack.c:
  Updated call to init_tree()
storage/myisam/sort.c:
  Updated call to my_init_dynamic_array()
storage/myisammrg/ha_myisammrg.cc:
  Updated call to init_sql_alloc()
storage/perfschema/pfs_check.cc:
  Rest current_thd
storage/perfschema/pfs_instr.cc:
  Removed DBUG_ENTER/DBUG_VOID_RETURN as at this point my_thread_var is not allocated anymore, which can cause problems.
support-files/compiler_warnings.supp:
  Disable compiler warning from offsetof macro.
 2013-01-23 16:16:14 +01:00
Sergei Golubchik
76f0b94bb0 merge with 5.3 
sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup
 2011-10-19 21:45:18 +02:00
Michael Widenius
3c78bfe7f1 Added progress reporting for alter table, LOAD DATA INFILE and for aria tables: check table, repair table, analyze table. 
- The client gets a progress report message that triggers a callback function if requested with mysql_options(MYSQL_PROGRESS_CALLBACK, function)
- Added Progress field last to 'show processlist'
- Stage, Max_stage and Progress field added to information_schema.progresslist
- The 'mysql' client by defaults enables progress reports when the output is a tty.
- Added progress_report_time time variable to configure how often progress reports is sent to client
Added read only system variable 'in_transaction' which is 1 if we have executed a BEGIN statement.


client/client_priv.h:
  Added OPT_REPORT_PROGRESS
client/mysql.cc:
  Added option --progress-reports (on by default if not batch mode)
  Progress reports is written to stdout for long running commands
include/Makefile.am:
  Added mysql/service_progress_report.h
include/myisamchk.h:
  Added variables to be able to do progress reporting in Aria and later in MyISAM
include/mysql.h:
  Added new mysql_options() parameter: MYSQL_PROGRESS_CALLBACK
include/mysql.h.pp:
  Added new mysql_options() parameter: MYSQL_PROGRESS_CALLBACK
include/mysql/plugin.h:
  Added functions for reporting progress.
include/mysql/plugin_auth.h.pp:
  Added functions for reporting progress.
include/mysql_com.h:
  Added CLIENT_PROGRESS mysql_real_connect() flag.
include/sql_common.h:
  Added callback function for reporting progress
mysql-test/r/old-mode.result:
  Ensure that SHOW PROGRESSLIST doesn't have the Progress column in old mode.
mysql-test/suite/funcs_1/datadict/datadict_priv.inc:
  Added new column
mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
  Test all new PROCESSLIST columns
mysql-test/suite/funcs_1/r/is_columns_is.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_is_embedded.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_is_embedded.result:
  Updated results
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result:
  Updated results
mysql-test/suite/funcs_1/r/processlist_priv_ps.result:
  Updated results
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
  Updated results
mysql-test/suite/funcs_1/r/processlist_val_ps.result:
  Updated results
mysql-test/suite/pbxt/r/pbxt_locking.result:
  Updated results
mysql-test/suite/pbxt/r/skip_name_resolve.result:
  Updated results
mysql-test/t/old-mode.test:
  Ensure that SHOW PROGRESSLIST doesn't have the Progress column in old mode.
plugin/handler_socket/handlersocket/Makefile.am:
  Added -lmysqlservices
scripts/mytop.sh:
  Made 'State' field width dynamic.
  Added 'Progress' to process list display.
sql-common/client.c:
  Added handling of progress messages.
  Removed check_license() function.
sql/mysql_priv.h:
  Added opt_progress_report_time
sql/mysqld.cc:
  Added progress_report_time time variable to configure how often progress reports is sent to client
sql/protocol.cc:
  Added net_send_progress_packet()
sql/protocol.h:
  New prototypes
sql/set_var.cc:
  Added variables progress_report_time and in_transaction
sql/sql_acl.cc:
  Safety fix: Made client_capabilities ulonglong
sql/sql_class.cc:
  Added interface functions for progress reporting
sql/sql_class.h:
  Added varibles in THD for progress reporting.
  Added CF_REPORT_PROGRESS
sql/sql_load.cc:
  Added progress reporting for LOAD DATA INFILE
sql/sql_parse.cc:
  Added CF_REPORT_PROGRESS for top level commands for which it's safe to send progress reports to client
sql/sql_show.cc:
  Added Progress field last to 'show processlist'
  Stage, Max_stage and Progress field added to information_schema.progresslist
sql/sql_table.cc:
  Added progress reporting for ALTER TABLE
  Added THD as argument to copy_data_between_tables()
storage/maria/ha_maria.cc:
  Added progress reporting for check table, repair table, analyze table
  Fixed a bug in start_bulk_insert() that caused alter table to always run with all keys enabled.
storage/maria/ma_check.c:
  Added progress reporting
  Remember old state before starting repair. This removes some warnings from optimize_table if create-with-sort fails.
storage/maria/ma_check_standalone.h:
  Added dummy reporting function for standalone Aria programs.
storage/maria/ma_sort.c:
  Added progress reporting
storage/maria/maria_chk.c:
  Updated version
storage/maria/maria_def.h:
  Added new prototypes
tests/mysql_client_test.c:
  Added test case for progress reporting
 2011-07-01 15:08:30 +03:00
Igor Babaev
63d6dbc4ab Fixed 3 valgrind bugs. 
Two of them (in the function make_join_statistics and in the function
sort_and_filter_keyuse) were due to bad merges while the third bug was
triggered by uninitialized values of the field JOIN_TAB::preread_init_done.

Fixed a compiler warning in mysql_priv.h.

Commented out some queries from the funcs_1 suite returning wrong
errors due to bugs concerning updatable views (see bugs 784297 and
784303).

Adjusted some results for the test cases with derived tables from
different suites.
 2011-05-21 13:12:21 -07:00
Michael Widenius
e63b5546c5 Implementation of MWL#172: Add support for prepared statements to HANDLER READ 
It includes speed optimizations for HANDLER READ by caching as much as possible in HANDLER OPEN
Other things:
- Added mysqld option --disable-thr-alarm to be able to benchmark things without thr_alarm
- Changed 'Locked' state to 'System lock' and 'Table lock' (these where used in the code but never shown to end user)
- Better error message if mysql_install_db.sh fails
- Moved handler function prototypes to sql_handler.h
- Remove not anymore used 'thd->locked' member


include/thr_alarm.h:
  Added my_disable_thr_alarm
include/thr_lock.h:
  Add new member to THR_LOCK_DATA to remember original lock type state. This is needed as thr_unlock() resets type to TL_UNLOCK.
mysql-test/include/check_no_concurrent_insert.inc:
  Locked -> Table lock
mysql-test/include/handler.inc:
  Locked -> Table lock
mysql-test/r/handler_innodb.result:
  Updated results for new tests
mysql-test/r/handler_myisam.result:
  Updated results for new tests
mysql-test/r/sp-threads.result:
  Locked -> Table lock
mysql-test/suite/binlog/t/binlog_stm_row.test:
  Locked -> Table lock
mysql-test/suite/funcs_1/datadict/processlist_val.inc:
  Locked -> Table lock
mysql-test/suite/pbxt/t/lock_multi.test:
  Locked -> Table lock
mysql-test/suite/sys_vars/r/concurrent_insert_func.result:
  Locked -> Table lock
mysql-test/suite/sys_vars/t/concurrent_insert_func.test:
  Locked -> Table lock
mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test:
  Locked -> Table lock
mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test:
  Locked -> Table lock
mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test:
  Locked -> Table lock
mysql-test/t/insert_notembedded.test:
  Locked -> Table lock
mysql-test/t/lock_multi.test:
  Locked -> Table lock
mysql-test/t/merge-big.test:
  Locked -> Table lock
mysql-test/t/multi_update.test:
  Locked -> Table lock
mysql-test/t/query_cache_28249.test:
  Locked -> Table lock
mysql-test/t/sp_notembedded.test:
  Locked -> Table lock
mysql-test/t/sp_sync.test:
  Locked -> Table lock
mysql-test/t/status.test:
  Locked -> Table lock
mysql-test/t/trigger_notembedded.test:
  Locked -> Table lock
mysys/thr_alarm.c:
  Added option to disable thr_alarm
mysys/thr_lock.c:
  Detect loops
scripts/mysql_install_db.sh:
  Give better error message if something goes wrong
sql/Makefile.am:
  Added sql_handler.h
sql/lock.cc:
  Split functions to allow one to cache value if store_lock() (for HANDLER functions).
  - Split mysql_lock_tables() into two functions, where first one allocates MYSQL_LOCK and other other one uses it.
  - Made get_lock_data() an external function.
  - Added argument to mysql_unlock_tables() to not free sql_lock.
  - Added argument to reset_lock_data() to reset lock structure to initial state (as after get_lock_data())
sql/mysql_priv.h:
  Moved handler function prototypes to sql_handler.h
  Added new lock functions.
sql/mysqld.cc:
  Added --thread-alarm startup option
sql/net_serv.cc:
  Don't call vio_blocking() if not needed
sql/sql_base.cc:
  include sql_handler.h
sql/sql_class.cc:
  include sql_handler.h
  Remove not anymore used 'thd->locked' member
sql/sql_class.h:
  Remove not anymore used 'thd->locked' member
sql/sql_db.cc:
  include sql_handler.h
sql/sql_delete.cc:
  include sql_handler.h
sql/sql_handler.cc:
  Rewrote all code to use SQL_HANDLER instead of TABLE_LIST (original interface)
  Rewrote mysql_ha_open() to cache all things from TABLE_LIST and items for field list, where etc.
  In mysql_ha_open() also cache MYSQL_LOCK structure from get_lock_data().
  Split functions into smaller sub functions (needed to be able to implement mysql_ha_read_prepare())
  Added mysql_ha_read_prepare() to allow one to prepare HANDLER READ.
sql/sql_handler.h:
  Interface to sql_handler.cc
sql/sql_parse.cc:
  include sql_handler.h
sql/sql_prepare.cc:
  Added mysql_test_handler_read(), prepare for HANDLER READ
sql/sql_rename.cc:
  include sql_handler.h
sql/sql_show.cc:
  Removed usage of thd->locked
sql/sql_table.cc:
  include sql_handler.h
sql/sql_trigger.cc:
  include sql_handler.h
 2011-01-04 00:55:41 +02:00
Sergei Golubchik
65ca700def merge. 
checkpoint.
does not compile.
 2010-11-25 18:17:28 +01:00
Sergei Golubchik
e246077bcf rename maria to aria 2010-09-12 18:40:01 +02:00
Dmitry Lenev
8d0dc9b58b Part of fix for bug#52044 "FLUSH TABLES WITH READ LOCK and 
FLUSH TABLES <list> WITH READ LOCK are incompatible" to
be pushed as separate patch.

Replaced thread state name "Waiting for table", which was
used by threads waiting for a metadata lock or table flush, 
with a set of names which better reflect types of resources
being waited for.

Also replaced "Table lock" thread state name, which was used 
by threads waiting on thr_lock.c table level lock, with more
elaborate "Waiting for table level lock", to make it 
more consistent with other thread state names.

Updated test cases and their results according to these 
changes.

Fixed sys_vars.query_cache_wlock_invalidate_func test to not
to wait for timeout of wait_condition.inc script.

mysql-test/r/query_cache.result:
  Added test coverage for query_cache_wlock_invalidate
  behavior for implicitly locked tables.
mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result:
  Fixed sys_vars.query_cache_wlock_invalidate_func test to not
  to wait for timeout of wait_condition.inc script. Reverted
  changes to test which introduced timeout and replaced waiting
  condition with a more appropriate one.
  Test coverage for query_cache_wlock_invalidate behavior for
  implicitly locked tables was added to query_cache.test.
mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test:
  Fixed sys_vars.query_cache_wlock_invalidate_func test to not
  to wait for timeout of wait_condition.inc script. Reverted
  changes to test which introduced timeout and replaced waiting
  condition with a more appropriate one.
  Test coverage for query_cache_wlock_invalidate behavior for
  implicitly locked tables was added to query_cache.test.
mysql-test/t/query_cache.test:
  Added test coverage for query_cache_wlock_invalidate
  behavior for implicitly locked tables.
mysys/thr_lock.c:
  Replaced "Table lock" thread state name, which was used by 
  threads waiting on thr_lock.c table level lock, with more
  elaborate "Waiting for table level lock", to make it 
  consistent with thread state names which are used while
  waiting for metadata locks and table flush.
sql/mdl.cc:
  Replaced thread state name "Waiting for table", which was
  used by threads waiting for a metadata lock or table flush, 
  with a set of names which better reflect types of resources
  being waited for. 
  
  To implement this:
  - Adjusted MDL_wait::timed_wait() to take thread state name
    as parameter.
  - Introduced method of MDL_key class which allows to get
    thread state name to be used while waiting for resource
    corresponding to the key and changed code to use it.
    Added array translating namespaces to thread state names
    as part of this change.
sql/mdl.h:
  To implement this:
  - Adjusted MDL_wait::timed_wait() to take thread state name
    as parameter.
  - Introduced method of MDL_key class which allows to get
    thread state name to be used while waiting for resource
    corresponding to the key and changed code to use it.
    Added array translating namespaces to thread state names
    as part of this change.
sql/sql_base.cc:
  Replaced thread state name "Waiting for table", which was
  used by threads waiting for table flush, with a more elaborate
  "Waiting for table flush".
 2010-08-06 15:29:37 +04:00
Michael Widenius
b34262264a Fixed suppression of compiler/test warnings 
Fixed some timing issues in test suite



mysql-test/mysql-test-run.pl:
  Added suppression of errors that comes when master is killed before slave has connect (like with rpl_udf.test)
mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
  Wait for check thread to end
mysql-test/suite/pbxt/t/status.test:
  Added longer sleep to avoid timing issue
support-files/compiler_warnings.supp:
  Fixed wrong suppression
 2010-04-07 18:26:30 +03:00
Konstantin Osipov
6cf17332bb next-4284 tree: fix the failures of processlist_val_* tests, 
update the condition to wait for in wait_condition
to reflect type-of-operation aware metadata locks.
 2010-02-11 18:19:04 +03:00
Konstantin Osipov
f30d17e078 Merge next-mr -> next-4284. 2010-02-04 00:48:40 +03:00
Dmitry Lenev
eba5d30e67 Implement new type-of-operation-aware metadata locks. 
Add a wait-for graph based deadlock detector to the
MDL subsystem.

Fixes bug #46272 "MySQL 5.4.4, new MDL: unnecessary deadlock" and
bug #37346 "innodb does not detect deadlock between update and
alter table".

The first bug manifested itself as an unwarranted abort of a
transaction with ER_LOCK_DEADLOCK error by a concurrent ALTER
statement, when this transaction tried to repeat use of a
table, which it has already used in a similar fashion before
ALTER started.

The second bug showed up as a deadlock between table-level
locks and InnoDB row locks, which was "detected" only after
innodb_lock_wait_timeout timeout.

A transaction would start using the table and modify a few
rows.
Then ALTER TABLE would come in, and start copying rows
into a temporary table. Eventually it would stumble on
the modified records and get blocked on a row lock.
The first transaction would try to do more updates, and get
blocked on thr_lock.c lock.
This situation of circular wait would only get resolved
by a timeout.

Both these bugs stemmed from inadequate solutions to the
problem of deadlocks occurring between different
locking subsystems.

In the first case we tried to avoid deadlocks between metadata
locking and table-level locking subsystems, when upgrading shared
metadata lock to exclusive one.
Transactions holding the shared lock on the table and waiting for
some table-level lock used to be aborted too aggressively.

We also allowed ALTER TABLE to start in presence of transactions
that modify the subject table. ALTER TABLE acquires
TL_WRITE_ALLOW_READ lock at start, and that block all writes
against the table (naturally, we don't want any writes to be lost
when switching the old and the new table). TL_WRITE_ALLOW_READ
lock, in turn, would block the started transaction on thr_lock.c
lock, should they do more updates. This, again, lead to the need
to abort such transactions.

The second bug occurred simply because we didn't have any
mechanism to detect deadlocks between the table-level locks
in thr_lock.c and row-level locks in InnoDB, other than
innodb_lock_wait_timeout.

This patch solves both these problems by moving lock conflicts
which are causing these deadlocks into the metadata locking
subsystem, thus making it possible to avoid or detect such
deadlocks inside MDL.

To do this we introduce new type-of-operation-aware metadata
locks, which allow MDL subsystem to know not only the fact that
transaction has used or is going to use some object but also what
kind of operation it has carried out or going to carry out on the
object.

This, along with the addition of a special kind of upgradable
metadata lock, allows ALTER TABLE to wait until all
transactions which has updated the table to go away.
This solves the second issue.
Another special type of upgradable metadata lock is acquired
by LOCK TABLE WRITE. This second lock type allows to solve the
first issue, since abortion of table-level locks in event of
DDL under LOCK TABLES becomes also unnecessary.

Below follows the list of incompatible changes introduced by
this patch:

- From now on, ALTER TABLE and CREATE/DROP TRIGGER SQL (i.e. those
  statements that acquire TL_WRITE_ALLOW_READ lock)
  wait for all transactions which has *updated* the table to
  complete.

- From now on, LOCK TABLES ... WRITE, REPAIR/OPTIMIZE TABLE
  (i.e. all statements which acquire TL_WRITE table-level lock) wait
  for all transaction which *updated or read* from the table
  to complete.
  As a consequence, innodb_table_locks=0 option no longer applies
  to LOCK TABLES ... WRITE.

- DROP DATABASE, DROP TABLE, RENAME TABLE no longer abort
  statements or transactions which use tables being dropped or
  renamed, and instead wait for these transactions to complete.

- Since LOCK TABLES WRITE now takes a special metadata lock,
  not compatible with with reads or writes against the subject table
  and transaction-wide, thr_lock.c deadlock avoidance algorithm
  that used to ensure absence of deadlocks between LOCK TABLES
  WRITE and other statements is no longer sufficient, even for
  MyISAM. The wait-for graph based deadlock detector of MDL
  subsystem may sometimes be necessary and is involved. This may
  lead to ER_LOCK_DEADLOCK error produced for multi-statement
  transactions even if these only use MyISAM:

  session 1:         session 2:
  begin;

  update t1 ...      lock table t2 write, t1 write;
                     -- gets a lock on t2, blocks on t1

  update t2 ...
  (ER_LOCK_DEADLOCK)

- Finally,  support of LOW_PRIORITY option for LOCK TABLES ... WRITE
  was abandoned.
  LOCK TABLE ... LOW_PRIORITY WRITE from now on has the same
  priority as the usual LOCK TABLE ... WRITE.
  SELECT HIGH PRIORITY no longer trumps LOCK TABLE ... WRITE  in
  the wait queue.

- We do not take upgradable metadata locks on implicitly
  locked tables. So if one has, say, a view v1 that uses
  table t1, and issues:
  LOCK TABLE v1 WRITE;
  FLUSH TABLE t1; -- (or just 'FLUSH TABLES'),
  an error is produced.
  In order to be able to perform DDL on a table under LOCK TABLES,
  the table must be locked explicitly in the LOCK TABLES list.

mysql-test/include/handler.inc:
  Adjusted test case to trigger an execution path on which bug 41110
  "crash with handler command when used concurrently with alter
  table" and bug 41112 "crash in mysql_ha_close_table/get_lock_data
  with alter table" were originally discovered. Left old test case
  which no longer triggers this execution path for the sake of
  coverage.
  Added test coverage for HANDLER SQL statements and type-aware
  metadata locks.
  Added a test for the global shared lock and HANDLER SQL.
  Updated tests to take into account that the old simple deadlock
  detection heuristics was replaced with a graph-based deadlock
  detector.
mysql-test/r/debug_sync.result:
  Updated results (see debug_sync.test).
mysql-test/r/handler_innodb.result:
  Updated results (see handler.inc test).
mysql-test/r/handler_myisam.result:
  Updated results (see handler.inc test).
mysql-test/r/innodb-lock.result:
  Updated results (see innodb-lock.test).
mysql-test/r/innodb_mysql_lock.result:
  Updated results (see innodb_mysql_lock.test).
mysql-test/r/lock.result:
  Updated results (see lock.test).
mysql-test/r/lock_multi.result:
  Updated results (see lock_multi.test).
mysql-test/r/lock_sync.result:
  Updated results (see lock_sync.test).
mysql-test/r/mdl_sync.result:
  Updated results (see mdl_sync.test).
mysql-test/r/sp-threads.result:
  SHOW PROCESSLIST output has changed due to the fact that waiting
  for LOCK TABLES WRITE now happens within metadata locking
  subsystem.
mysql-test/r/truncate_coverage.result:
  Updated results (see truncate_coverage.test).
mysql-test/suite/funcs_1/datadict/processlist_val.inc:
  SELECT FROM I_S.PROCESSLIST output has changed due to fact that
  waiting for LOCK TABLES WRITE now happens within metadata locking
  subsystem.
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
  SELECT FROM I_S.PROCESSLIST output has changed due to fact that
  waiting for LOCK TABLES WRITE now happens within metadata locking
  subsystem.
mysql-test/suite/rpl/t/rpl_sp.test:
  Updated to a new SHOW PROCESSLIST state name.
mysql-test/t/debug_sync.test:
  Use LOCK TABLES READ instead of LOCK TABLES WRITE as the latter
  no longer allows to trigger execution path involving waiting on
  thr_lock.c lock and therefore reaching debug sync-point covered
  by this test.
mysql-test/t/innodb-lock.test:
  Adjusted test case to the fact that innodb_table_locks=0 option is
  no longer supported, since LOCK TABLES WRITE handles all its
  conflicts within MDL subsystem.
mysql-test/t/innodb_mysql_lock.test:
  Added test for bug #37346 "innodb does not detect deadlock between
  update and alter table".
mysql-test/t/lock.test:
  Added test coverage which checks the fact that we no longer support
  DDL under LOCK TABLES on tables which were locked implicitly.
  Adjusted existing test cases accordingly.
mysql-test/t/lock_multi.test:
  Added test for bug #46272 "MySQL 5.4.4, new MDL: unnecessary
  deadlock".  Adjusted other test cases to take into account the
  fact that waiting for LOCK TABLES ... WRITE now happens within MDL
  subsystem.
mysql-test/t/lock_sync.test:
  Since LOCK TABLES ... WRITE now takes SNRW metadata lock for
  tables locked explicitly we have to implicitly lock InnoDB tables
  (through view) to trigger the table-level lock conflict between
  TL_WRITE and TL_WRITE_ALLOW_WRITE.
mysql-test/t/mdl_sync.test:
  Added basic test coverage for type-of-operation-aware metadata
  locks. Also covered with tests some use cases involving HANDLER
  statements in which a deadlock could arise.
  Adjusted existing tests to take type-of-operation-aware MDL into
  account.
mysql-test/t/multi_update.test:
  Update to a new SHOW PROCESSLIST state name.
mysql-test/t/truncate_coverage.test:
  Adjusted test case after making LOCK TABLES WRITE to wait until
  transactions that use the table to be locked are completed.
  Updated to the changed name of DEBUG_SYNC point.
sql/handler.cc:
  Global read lock functionality has been
  moved into a class.
sql/lock.cc:
  Global read lock functionality has been
  moved into a class.
  Updated code to use the new MDL API.
sql/mdl.cc:
  Introduced new type-of-operation aware metadata locks.
  To do this:
  - Changed MDL_lock to use one list for waiting requests and one
    list for granted requests. For each list, added a bitmap
    that holds information what lock types a list contains.
    Added a helper class MDL_lock::List to manipulate with granted
    and waited lists while keeping the bitmaps in sync
    with list contents.
  - Changed lock-compatibility functions to use bitmaps that
    define compatibility.
  - Introduced a graph based deadlock detector inspired by
    waiting_threads.c from Maria implementation.
  - Now that we have a deadlock detector, and no longer have
    a global lock to protect individual lock objects, but rather
    use an rw lock per object, removed redundant code for upgrade,
    and the global read lock. Changed the MDL API to
    no longer require the caller to acquire the global
    intention exclusive lock by means of a separate method.
    Removed a few more methods that became redundant.
  - Removed deadlock detection heuristic, it has been made
    obsolete by the deadlock detector.
  - With operation-type-aware metadata locks, MDL subsystem has
    become aware of potential conflicts between DDL and open
    transactions. This made it possible to remove calls to
    mysql_abort_transactions_with_shared_lock() from acquisition
    paths for exclusive lock and lock upgrade. Now we can simply
    wait for these transactions to complete without fear of
    deadlock. Function mysql_lock_abort() has also become
    unnecessary for all conflicting cases except when a DDL
    conflicts with a connection that has an open HANDLER.
sql/mdl.h:
  Introduced new type-of-operation aware metadata locks.
  Introduced a graph based deadlock detector and supporting
  methods.
  Added comments.
  God rid of redundant API calls.
  Renamed m_lt_or_ha_sentinel to m_trans_sentinel,
  since now it guards the global read lock as well as
  LOCK TABLES and HANDLER locks.
sql/mysql_priv.h:
  Moved the global read lock functionality into a
  class.
  Added MYSQL_OPEN_FORCE_SHARED_MDL flag which forces
  open_tables() to take MDL_SHARED on tables instead of
  metadata locks specified in the parser. We use this to
  allow PREPARE run concurrently in presence of
  LOCK TABLES ... WRITE.
  Added signature for find_table_for_mdl_ugprade().
sql/set_var.cc:
  Global read lock functionality has been
  moved into a class.
sql/sp_head.cc:
  When creating TABLE_LIST elements for prelocking or
  system tables set the type of request for metadata
  lock according to the operation that will be performed
  on the table.
sql/sql_base.cc:
  - Updated code to use the new MDL API.
  - In order to avoid locks starvation we take upgradable
    locks all at once. As result implicitly locked tables no
    longer get an upgradable lock. Consequently DDL and FLUSH
    TABLES for such tables is prohibited.
    find_write_locked_table() was replaced by
    find_table_for_mdl_upgrade() function.
    open_table() was adjusted to return TABLE instance with
    upgradable ticket when necessary.
  - We no longer wait for all locks on OT_WAIT back off
    action -- only on the lock that caused the wait
    conflict. Moreover, now we distinguish cases when we
    have to wait due to conflict in MDL and old version
    of table in TDC.
  - Upate mysql_notify_threads_having_share_locks()
    to only abort thr_lock.c waits of threads that
    have open HANDLERs, since lock conflicts with only
    these threads now can lead to deadlocks not detectable
    by the MDL deadlock detector.
  - Remove mysql_abort_transactions_with_shared_locks()
    which is no longer needed.
sql/sql_class.cc:
  Global read lock functionality has been moved into a class.
  Re-arranged code in THD::cleanup() to simplify assert.
sql/sql_class.h:
  Introduced class to incapsulate global read lock
  functionality.
  Now sentinel in MDL subsystem guards the global read lock
  as well as LOCK TABLES and HANDLER locks. Adjusted code
  accordingly.
sql/sql_db.cc:
  Global read lock functionality has been moved into a class.
sql/sql_delete.cc:
  We no longer acquire upgradable metadata locks on tables
  which are locked by LOCK TABLES implicitly. As result
  TRUNCATE TABLE is no longer allowed for such tables.
  Updated code to use the new MDL API.
sql/sql_handler.cc:
  Inform MDL_context about presence of open HANDLERs.
  Since HANLDERs break MDL protocol by acquiring table-level
  lock while holding only S metadata lock on a table MDL
  subsystem should take special care about such contexts (Now
  this is the only case when mysql_lock_abort() is used).
sql/sql_parse.cc:
  Global read lock functionality has been moved into a class.
  Do not take upgradable metadata locks when opening tables
  for CREATE TABLE SELECT as it is not necessary and limits
  concurrency.
  When initializing TABLE_LIST objects before adding them
  to the table list set the type of request for metadata lock
  according to the operation that will be performed on the
  table.
  We no longer acquire upgradable metadata locks on tables
  which are locked by LOCK TABLES implicitly. As result FLUSH
  TABLES is no longer allowed for such tables.
sql/sql_prepare.cc:
  Use MYSQL_OPEN_FORCE_SHARED_MDL flag when opening
  tables during PREPARE. This allows PREPARE to run
  concurrently in presence of LOCK TABLES ... WRITE.
sql/sql_rename.cc:
  Global read lock functionality has been moved into a class.
sql/sql_show.cc:
  Updated code to use the new MDL API.
sql/sql_table.cc:
  Global read lock functionality has been moved into a class.
  We no longer acquire upgradable metadata locks on tables
  which are locked by LOCK TABLES implicitly. As result DROP
  TABLE is no longer allowed for such tables.
  Updated code to use the new MDL API.
sql/sql_trigger.cc:
  Global read lock functionality has been moved into a class.
  We no longer acquire upgradable metadata locks on tables
  which are locked by LOCK TABLES implicitly. As result
  CREATE/DROP TRIGGER is no longer allowed for such tables.
  Updated code to use the new MDL API.
sql/sql_view.cc:
  Global read lock functionality has been moved into a class.
  Fixed results of wrong merge that led to misuse of GLR API.
  CREATE VIEW statement is not a commit statement.
sql/table.cc:
  When resetting TABLE_LIST objects for PS or SP re-execution
  set the type of request for metadata lock according to the
  operation that will be performed on the table. Do the same
  in auxiliary function initializing metadata lock requests
  in a table list.
sql/table.h:
  When initializing TABLE_LIST objects set the type of request
  for metadata lock according to the operation that will be
  performed on the table.
sql/transaction.cc:
  Global read lock functionality has been moved into a class.
 2010-02-01 14:43:06 +03:00
Sergey Glukhov
5a4a98af14 backported: 
-WL#2822 INFORMATION_SCHEMA.ROUTINES: Add missing columns
-WL#2003 INFORMATION_SCHEMA: PARAMETERS view
-addon for 'I_S optimization' WL
 2010-01-15 15:42:15 +04:00
Jon Olav Hauglid
ad6adb1398 Partial backport of: 
revno: 2762 [merge]
committer: Matthias Leich <mleich@mysql.com>
branch nick: mysql-6.0-bugteam-push
timestamp: Wed 2008-08-13 22:05:34 +0200
message:
  Upmerge 5.1 -> 6.0
    ------------------------------------------------------------
    revno: 2497.374.2
    committer: Matthias Leich <mleich@mysql.com>
    branch nick: mysql-5.1-bugteam-push
    timestamp: Wed 2008-08-13 21:44:54 +0200
    message:
      Fix for Bug#37853
          Test "funcs_1.processlist_val_ps" fails in various ways
      + corrections of logic in poll routines
      + minor improvements
 2010-01-14 14:03:24 +01:00
unknown
0855019e3a Fix multiple test suite failures in Buildbot due to races in the test cases or missing server features not properly checked 
mysql-test/r/func_misc.result:
  Move test that requires query cache from main.func_misc to main.query_cache.
mysql-test/r/mysqltest.result:
  Fix test failure due to race.
  This test case creates > 300 connections in a tight loop, and depending on thread
  scheduling and load, even though each connection is immediately disconnected
  before connecting the next one, the server max connections may still be exceeded
  due to server not being able to free old connections as fast as new ones are made.
mysql-test/r/query_cache.result:
  Move test that requires query cache from main.func_misc to main.query_cache.
  Move test that requires query cache from main.variables to main.query_cache.
mysql-test/r/query_cache_notembedded.result:
  Move test that requires query cache from main.sp_notembedded to main.query_cache_notembedded.
mysql-test/r/sp_notembedded.result:
  Move test that requires query cache from main.sp_notembedded to main.query_cache_notembedded.
mysql-test/r/udf.result:
  Move test in main.udf that requires query cache to separate file.
mysql-test/r/udf_query_cache.result:
  Move test in main.udf that requires query cache to separate file.
mysql-test/r/variables.result:
  Move test that requires query cache from main.variables to main.query_cache.
mysql-test/suite/funcs_1/datadict/processlist_val.inc:
  Fix race where result file may show state "cleaning up" in the small window
  between setting COMMAND to 'Sleep' and clearing STATE.
mysql-test/suite/rpl/r/rpl_temporary.result:
  Fix race with suppression of warning message by fixing the test to not generate the
  warning message in the first place.
  
  Problem was a race between creating an anonymous account and resetting the slave.
  If the slave reset happens before replicating the account, the subsequest deletion
  of the account will fail to replicate correctly due to missing row.
mysql-test/suite/rpl/t/rpl_temporary.test:
  Fix race with suppression of warning message by fixing the test to not generate the
  warning message in the first place.
  
  Problem was a race between creating an anonymous account and resetting the slave.
  If the slave reset happens before replicating the account, the subsequest deletion
  of the account will fail to replicate correctly due to missing row.
mysql-test/t/func_misc.test:
  Move test that requires query cache from main.func_misc to main.query_cache.
  Move test that requires query cache from main.variables to main.query_cache.
mysql-test/t/mysqltest.test:
  Fix test failure due to race.
  This test case creates > 300 connections in a tight loop, and depending on thread
  scheduling and load, even though each connection is immediately disconnected
  before connecting the next one, the server max connections may still be exceeded
  due to server not being able to free old connections as fast as new ones are made.
mysql-test/t/query_cache.test:
  Move test that requires query cache to main.query_cache.
mysql-test/t/query_cache_notembedded.test:
  Move test that requires query cache from main.sp_notembedded to main.query_cache_notembedded.
mysql-test/t/sp_notembedded.test:
  Move test that requires query cache from main.sp_notembedded to main.query_cache_notembedded.
mysql-test/t/udf.test:
  Move test in main.udf that requires query cache to separate file.
mysql-test/t/udf_query_cache-master.opt:
  Move test in main.udf that requires query cache to separate file.
mysql-test/t/udf_query_cache.test:
  Move test in main.udf that requires query cache to separate file.
mysql-test/t/variables.test:
  Move test that requires query cache from main.variables to main.query_cache.
tests/mysql_client_test.c:
  In tests that require query cache, skip the test if query cache not available.
  Do this dynamically rather than using HAVE_QUERY_CACHE, as there is no guarantee
  that the server we run against was compiled with same preprocessor #define as
  the mysql_client_test program (and since it is trivial to check dynamically).
 2010-01-11 14:15:28 +01:00
Sergey Glukhov
795102b786 Bug#35427 INFORMATION_SCHEMA.TABLES.TABLE_CATALOG is NULL, should be "def" 
backport to betony
 2009-10-23 16:02:20 +05:00
Sergey Glukhov
9745498778 Bug#24062 Incorrect error msg after execute DROP TABLE IF EXISTS on information_schema 
backport to Betony
 2009-10-23 11:56:30 +05:00
unknown
314ac2a0ab Fix failures in the funcs_1 test suite. 
Some result updates necessary due to extra tables and columns added in
information_schema in MariaDB (XtraDB, PBXT, microsec_process).

Also fix bad merge of two result files; apparently the test case was merged,
but the result file was not.

mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
  Handle the new TIME_MS column in information_schema.processlist.
mysql-test/suite/funcs_1/datadict/processlist_val.inc:
  Handle the new TIME_MS column in information_schema.processlist.
mysql-test/suite/funcs_1/r/is_columns_is.result:
  Handle new tables in information_schema.
mysql-test/suite/funcs_1/r/is_tables_is.result:
  Handle new tables in information_schema.
mysql-test/suite/funcs_1/r/is_tables_myisam.result:
  Fix previous bad merge; apparently this file was not merged along with test changes.
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result:
  Handle the new TIME_MS column in information_schema.processlist.
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
  Fix previous bad merge; apparently this file was not merged along with test changes.
  Also handle the new TIME_MS column in INFORMATION_SCHEMA.PROCESSLIST.
mysql-test/suite/funcs_1/t/is_columns_is.test:
  Since result file includes PBXT information_schema tables, we need PBXT to run this test.
 2009-10-10 11:59:06 +02:00
Sergey Petrunya
29f0dcb563 Merge MySQL->MariaDB 
* Finished Monty and Jani's merge
* Some InnoDB tests still fail (because it's old xtradb code run against
  newer testsuite). They are expected to go after mergning with the latest
  xtradb.
 2009-09-08 00:50:10 +04:00
Matthias Leich
86cb0d8ce4 Merge 5.0 -> 5.1 of fixes for various funcs_1 related bugs 2009-06-19 17:44:29 +02:00
Matthias Leich
59730d8fce Fix for Bug#40545, Bug#40209, Bug#40618, Bug#38346 
Details:
  - Limit the queries to character sets and collations
    which are most probably available in all build types.
    But try to preserve the intention of the tests.
  - Remove the variants adjusted to some build types.

  Note:
  1. The results of the review by Bar are included.
  2. I am not able to check the correctness of this patch
     on any existing build type and any MySQL version.
     So it could happen that the new test fails somewhere.
 2009-06-19 17:04:25 +02:00
Davi Arnaut
cb26bb932c Remove assignments of the $MASTER_MYSOCK variable. 
This variable is defined by default and one should not do it
directly as the socket variable is not available on Windows.
 2009-06-09 13:09:16 -03:00
Bjorn Munch
f7a645c9cc Bug #45120 Fix of 44922 caused regression in funcs_1.processlist_priv_no_prot 
Protected '' in connect command with ""
 2009-05-27 10:54:59 +02:00
Magnus Blåudd
523bfc8d01 Bug#43983 Support force restart of all servers after test ended 
- Update testcases funcs_1.is_routines to only query
   information_schema.routines about the routines in 'test'
   database(where it has created it's routines)
 2009-04-01 10:59:10 +02:00
Guilhem Bichot
704b4845aa merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. 
There were so many changes into mtr (this is the new mtr coming) that I rather
copied mtr from 6.0-main here (at least this one knows how to run Maria tests).
I also fixed suite/maria tests to be accepted by the new mtr.

mysys/thr_mutex.c:
  adding DBUG_PRINT here, so that we can locate where the warning is issued.
 2009-02-12 15:08:56 +01:00
Alfranio Correia
5afd989555 Several fixes in funcs_1 suite: 
1 - MASTER_MYSOCK fixed inexistent environment variable.
  2 - Fixed mismatch in result files due to changes in MTR.
 2009-02-01 17:15:58 +00:00
Guilhem Bichot
926aaf4635 Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, mysys/mf_keycache.c, mysql-test/t/*myisam* 
since previous merge. MARIA_PAGECACHE_READS in maria-preload.test are down a little bit (5%), which must be a good
side-effect of some sql/ change.
 2008-12-10 10:02:25 +01:00
Sergey Glukhov
029def6c8a Bug#36035 I_S.TABLES.UPDATE_TIME not being set on INSERT for Windows 
added FLUSH TABLES after INSERT because UPDATE_TIME is updated with delay
on Win.


mysql-test/suite/funcs_1/datadict/is_tables.inc:
  test fix
mysql-test/suite/funcs_1/r/is_tables.result:
  result fix
 2008-11-13 12:38:30 +04:00
Michael Widenius
f47e003e1b Merged 5.1 with maria 5.1 2008-10-10 18:28:41 +03:00
Matthias Leich
1ffdec61a1 Fix for Bug#38270 Test "processlist_priv_ps" fails on varying "processlist" output 
Details of the fix:
- wrong command and state in processlist -> insert poll routine
- unexpected additional session -> abort if unexpected session found
 2008-08-21 16:38:49 +02:00
Matthias Leich
d23e8e06a1 Fix for Bug#37853 
Test "funcs_1.processlist_val_ps" fails in various ways
+ corrections of logic in poll routines
+ minor improvements
 2008-08-13 21:44:54 +02:00
Guilhem Bichot
3e37fb35b1 Back-port of changes made to 6.0-maria (to remove compiler warnings or fix simple test failures) 
in the last days: substitution in tests has to work for absolute datadir (/dev/shm/...);
internal temp tables (like information_schema) can be Maria; Maria may not be compiled in; splitting
too long maria.test in two; mtr --embedded runs in mysql-test not mysql-test/var/master-data
so we need some absolute paths in tests; can't restart mysqld in --embedded; missing DBUG_VOID_RETURN in
mysqltest.c (fix from Serg); is_collation_character_set_applicability.test was too long name
which broke tar's 99-char limit.
 2008-07-01 22:47:09 +02:00
Matthias Leich
2ed83dd95f Upmerge 5.0 -> 5.1 2008-07-01 14:21:50 +02:00
Matthias Leich
52fee16e88 Fix for 
Bug#36787 Test funcs_1.charset_collation_1 failing
Details:
1. Skip charset_collation_1 if charset "ucs2_bin" is
   missing (property which distincts "vanilla" builds
   from the others)
2. Let builds with version_comment LIKE "%Advanced%"
   (found them for 5.1) execute charset_collation_3.
3. Update comments charset_collation.inc so that they
   reflect the current experiences.
 2008-06-30 22:16:06 +02:00
Matthias Leich mleich@mysql.com
672cb2c950 1. Upmerge of fix for the bugs 
37167 funcs_1: Many tests fail if the embedded
                  server is used.
   37164 funcs_1: Some tests fail if an optional
                  character set is missing.
   + some cleanup within the testsuite related to the
     fixes above
   + some adjustments to open bugs on Mac OS X
2. Skip tests which suffer from bug
   37456 funcs_1: Several tests crash when used
                  with embedded server
3. Minor cleanup in some tests
 2008-06-18 19:23:55 +02:00
Matthias Leich mleich@mysql.com
28f9704737 Fix for 
Bug#37167 funcs_1: Many tests fail if the embedded server is used.
   Bug#37164 funcs_1: Some tests fail if an optional character set is missing.
+ some cleanup within the testsuite related to the fixes above
+ some adjustments to open bugs on Mac OS X

Details:
- Remove the initial loading of data from tests if these data
  are not somewhere retrieved
- Remove any use of columns with attribute unicode
  (-> UCS2 is no more needed) from tests where unicode
  properties are not checked or somehow required
- Create a separate branch of the Character maximum length test
  (CML). If UCS2 is available than this test gets applied to
  every available type of string column with attribute unicode
  This prevents any loss of coverage by the points above.
- Disable the execution of is_tables_ndb which gives wrong
  results because of a bug. Correct the exepected results of
  this test.
- In case of tests failing when applied to the embedded server
    1) Create a variant of this test for the embedded server
  or
    2) Skip the test in case of embedded server
  depending on purpose and complexity of test.
- Skip the tests which could suffer from
  Bug 28309 First insert violates unique constraint - was "memory" table empty ?
  Bug 37380 Test funcs_1.is_columns_myisam_embedded fails on OS X
  (both bugs Mac OS X, embedded server, MySQL 5.0 only)
- Minor improvements like remove typos
 2008-06-16 20:39:58 +02:00
unknown
1e7bc4618b Merge ramayana.hindu.god:/home/tsmith/m/bk/bugteam/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/suite/funcs_1/datadict/processlist_val.inc:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/suite/rpl/t/disabled.def:
  SCCS merged
 2008-04-29 20:55:48 -06:00
unknown
92098d5d66 Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows 
Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
Bug#36034 - Test parts.part_supported_sql_func_<eng> fails on Windows
Bug#36036 - Test parts.partition_alter1_<eng> fails on Windows
Bug#36037 - Test parts.partition_alter2_<eng> fails on Windows
Bug#36038 - Test parts.partition_basic_<engine> failing on Windows
Bug#36039 - Test parts.partition_engine_<eng> fails on Windows
Bug#36040 - Test parts.partition_syntax_<eng> fails on Windows

Changeset to fix multiple 5.1.24-rc build bugs on Windows platforms.

Many of these bugs had the same root causes.


mysql-test/mysql-test-run.pl:
  Bug#36034 - Test parts.partition_supported_sql_func_<eng> fails on Windows
  
  Kent suggested these changes to ensure all contents of mysql-test/std_data are copied to std_data_ln on Windows (no symlinks)
mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
  Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows
  
  Altered .inc file to include HOST column in the --replace_column clauses.
  
  Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
mysql-test/suite/funcs_1/datadict/processlist_val.inc:
  Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
  
  Altered .inc file to include HOST column in the --replace_column clauses.
  
  Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result:
  Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows
  
  Altered .inc file to include HOST column in the --replace_column clauses.
  
  Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
  
  -reran .result file to account for change in --replace_column calls
mysql-test/suite/funcs_1/r/processlist_priv_ps.result:
  Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows
  
  Altered .inc file to include HOST column in the --replace_column clauses.
  
  Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
  
  -reran .result file to account for change in --replace_column calls
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
  Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
  
  Altered .inc file to include HOST column in the --replace_column clauses.
  
  Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
  
  Reran .result file to account for changes to --replace_column clauses
mysql-test/suite/funcs_1/r/processlist_val_ps.result:
  Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
  
  Altered .inc file to include HOST column in the --replace_column clauses.
  
  Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
  
  Reran .result file to account for changes to --replace_column clauses
mysql-test/suite/parts/inc/partition_layout_check1.inc:
  Bug#36036 - Test parts.partition_alter1_<eng> fails on Windows
  Bug#36037 - Test parts.partition_alter2_<eng> fails on Windows
  Bug#36038 - Test parts.partition_basic_<engine> failing on Windows
  Bug#36039 - Test parts.partition_engine_<eng> fails on Windows
  Bug#36040 - Test parts.partition_syntax_<eng> fails on Windows
  
  Added replace_result clause to account for Windows' use of '\r' vs. '\n'
  
  This difference was causing failures on Windows.
  
  Also, mleich added some changes to remove some -ls clauses that weren't necessary
mysql-test/suite/parts/inc/partition_layout_check2.inc:
  Bug#36036 - Test parts.partition_alter1_<eng> fails on Windows
  Bug#36037 - Test parts.partition_alter2_<eng> fails on Windows
  Bug#36038 - Test parts.partition_basic_<engine> failing on Windows
  Bug#36039 - Test parts.partition_engine_<eng> fails on Windows
  Bug#36040 - Test parts.partition_syntax_<eng> fails on Windows
  
  Added replace_result clause to account for Windows' use of '\r' vs. '\n'
  
  This difference was causing failures on Windows.
  
  Also, mleich added some changes to remove some -ls clauses that weren't necessary
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result:
  changes by mleich to remove unneeded use of -ls clause in .result file 
  
  These clauses were removed from partition_layout_check1.inc and partition_layout_check2.inc
 2008-04-26 19:52:43 -04:00
unknown
93f2e39529 Post merge fix for 
ChangeSet@1.2583, 2008-03-31
   Merge five.local.lan:/work/merge/mysql-5.0-Bug
   into  five.local.lan:/work/merge/mysql-5.1-Bug
   Addditional manual fixes will be needed.
   MERGE: 1.1810.3667.16

   Which contains
      ChangeSet@1.1810.3667.16, 2008-03-31
      Fix for Bug
        #35335 funcs_1: Some tests fail within load_file during
                        pushbuild runs
   ...


mysql-test/std_data/funcs_1/ndb_tb1.txt:
  Rename: mysql-test/suite/funcs_1/data/ndb_tb1.txt -> mysql-test/std_data/funcs_1/ndb_tb1.txt
mysql-test/std_data/funcs_1/ndb_tb2.txt:
  Rename: mysql-test/suite/funcs_1/data/ndb_tb2.txt -> mysql-test/std_data/funcs_1/ndb_tb2.txt
mysql-test/std_data/funcs_1/ndb_tb3.txt:
  Rename: mysql-test/suite/funcs_1/data/ndb_tb3.txt -> mysql-test/std_data/funcs_1/ndb_tb3.txt
mysql-test/std_data/funcs_1/ndb_tb4.txt:
  Rename: mysql-test/suite/funcs_1/data/ndb_tb4.txt -> mysql-test/std_data/funcs_1/ndb_tb4.txt
 2008-04-01 13:18:31 +02:00
unknown
2c4f9bd486 Merge five.local.lan:/work/merge/mysql-5.0-Bug 
into  five.local.lan:/work/merge/mysql-5.1-Bug
Addditional manual fixes will be needed.


BitKeeper/deleted/.del-triggers_master.test:
  Auto merged
mysql-test/std_data/funcs_1/innodb_tb1.txt:
  Auto merged
mysql-test/std_data/funcs_1/innodb_tb2.txt:
  Auto merged
mysql-test/std_data/funcs_1/innodb_tb3.txt:
  Auto merged
mysql-test/std_data/funcs_1/innodb_tb4.txt:
  Auto merged
mysql-test/std_data/funcs_1/memory_tb1.txt:
  Auto merged
mysql-test/std_data/funcs_1/memory_tb2.txt:
  Auto merged
mysql-test/std_data/funcs_1/memory_tb3.txt:
  Auto merged
mysql-test/std_data/funcs_1/memory_tb4.txt:
  Auto merged
mysql-test/std_data/funcs_1/myisam_tb1.txt:
  Auto merged
mysql-test/std_data/funcs_1/myisam_tb2.txt:
  Auto merged
mysql-test/std_data/funcs_1/myisam_tb3.txt:
  Auto merged
mysql-test/std_data/funcs_1/myisam_tb4.txt:
  Auto merged
mysql-test/std_data/funcs_1/t3.txt:
  Auto merged
mysql-test/std_data/funcs_1/t4.txt:
  Auto merged
mysql-test/std_data/funcs_1/t7.txt:
  Auto merged
mysql-test/std_data/funcs_1/t9.txt:
  Auto merged
mysql-test/suite/funcs_1/README.txt:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
  Auto merged
mysql-test/suite/funcs_1/include/innodb_tb1.inc:
  Auto merged
mysql-test/suite/funcs_1/include/innodb_tb2.inc:
  Auto merged
mysql-test/suite/funcs_1/include/innodb_tb3.inc:
  Auto merged
mysql-test/suite/funcs_1/include/innodb_tb4.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb1.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb2.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb3.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb4.inc:
  Auto merged
mysql-test/suite/funcs_1/include/myisam_tb1.inc:
  Auto merged
mysql-test/suite/funcs_1/include/myisam_tb2.inc:
  Auto merged
mysql-test/suite/funcs_1/include/myisam_tb3.inc:
  Auto merged
mysql-test/suite/funcs_1/include/myisam_tb4.inc:
  Auto merged
mysql-test/suite/funcs_1/include/sp_tb.inc:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_columns_memory.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
  Auto merged
mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
  Auto merged
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
  Auto merged
mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
  Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
  Auto merged
mysql-test/mysql-test-run.pl:
  ul
  ul
 2008-03-31 23:39:51 +02:00
unknown
004123892d Fix for 
Bug#35335 funcs_1: Some tests fail within load_file during
                      pushbuild runs
   Solution: 1. Move files with input data used in load_file, 
                load data etc. 
                from suite/funcs_1/<whatever>
                to std_data
             2. Use for testsuite funcs_1 the server option
                --secure-file-priv=<MYSQLTEST_VARDIR>
             3. Outfiles have to be stored under MYSQLTEST_VARDIR 
+ changes according to WL#4304 Cleanup in funcs_1 tests
  - backport of fixes/improvements made in 5.1 to 5.0
    The differences between scripts in 5.0 and 5.1 cause
    much additional and annoying work during any upmerge.
  - replace error numbers with names
  - improved comments
  - improved formatting
  - Unify storage engine names so that result files for
    storage engine variants do not differ (some tests)
  - remove a script no more used (tests are done in other scripts)


BitKeeper/deleted/.del-triggers_master.test:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_master.test
mysql-test/std_data/funcs_1/innodb_tb1.txt:
  Rename: mysql-test/suite/funcs_1/data/innodb_tb1.txt -> mysql-test/std_data/funcs_1/innodb_tb1.txt
mysql-test/std_data/funcs_1/innodb_tb2.txt:
  Rename: mysql-test/suite/funcs_1/data/innodb_tb2.txt -> mysql-test/std_data/funcs_1/innodb_tb2.txt
mysql-test/std_data/funcs_1/innodb_tb3.txt:
  Rename: mysql-test/suite/funcs_1/data/innodb_tb3.txt -> mysql-test/std_data/funcs_1/innodb_tb3.txt
mysql-test/std_data/funcs_1/innodb_tb4.txt:
  Rename: mysql-test/suite/funcs_1/data/innodb_tb4.txt -> mysql-test/std_data/funcs_1/innodb_tb4.txt
mysql-test/std_data/funcs_1/memory_tb1.txt:
  Rename: mysql-test/suite/funcs_1/data/memory_tb1.txt -> mysql-test/std_data/funcs_1/memory_tb1.txt
mysql-test/std_data/funcs_1/memory_tb2.txt:
  Rename: mysql-test/suite/funcs_1/data/memory_tb2.txt -> mysql-test/std_data/funcs_1/memory_tb2.txt
mysql-test/std_data/funcs_1/memory_tb3.txt:
  Rename: mysql-test/suite/funcs_1/data/memory_tb3.txt -> mysql-test/std_data/funcs_1/memory_tb3.txt
mysql-test/std_data/funcs_1/memory_tb4.txt:
  Rename: mysql-test/suite/funcs_1/data/memory_tb4.txt -> mysql-test/std_data/funcs_1/memory_tb4.txt
mysql-test/std_data/funcs_1/myisam_tb1.txt:
  Rename: mysql-test/suite/funcs_1/data/myisam_tb1.txt -> mysql-test/std_data/funcs_1/myisam_tb1.txt
mysql-test/std_data/funcs_1/myisam_tb2.txt:
  Rename: mysql-test/suite/funcs_1/data/myisam_tb2.txt -> mysql-test/std_data/funcs_1/myisam_tb2.txt
mysql-test/std_data/funcs_1/myisam_tb3.txt:
  Rename: mysql-test/suite/funcs_1/data/myisam_tb3.txt -> mysql-test/std_data/funcs_1/myisam_tb3.txt
mysql-test/std_data/funcs_1/myisam_tb4.txt:
  Rename: mysql-test/suite/funcs_1/data/myisam_tb4.txt -> mysql-test/std_data/funcs_1/myisam_tb4.txt
mysql-test/std_data/funcs_1/t3.txt:
  Rename: mysql-test/suite/funcs_1/data/t3.txt -> mysql-test/std_data/funcs_1/t3.txt
mysql-test/std_data/funcs_1/t4.txt:
  Rename: mysql-test/suite/funcs_1/data/t4.txt -> mysql-test/std_data/funcs_1/t4.txt
mysql-test/std_data/funcs_1/t7.txt:
  Rename: mysql-test/suite/funcs_1/data/t7.txt -> mysql-test/std_data/funcs_1/t7.txt
mysql-test/std_data/funcs_1/t9.txt:
  Rename: mysql-test/suite/funcs_1/data/t9.txt -> mysql-test/std_data/funcs_1/t9.txt
mysql-test/Makefile.am:
  Introduce installation of funcs_1 files in std_data.
mysql-test/mysql-test-run.pl:
  The tests within funcs_1 need a server started with
      --secure-file-priv=<MYSQLTEST_VARDIR>
  like the main regression tests.
mysql-test/suite/funcs_1/README.txt:
  Extended description
mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
  Cleanup
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Cleanup
mysql-test/suite/funcs_1/include/innodb_tb1.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/innodb_tb2.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/innodb_tb3.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/innodb_tb4.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/memory_tb1.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/memory_tb2.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/memory_tb3.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/memory_tb4.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/myisam_tb1.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/myisam_tb2.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/myisam_tb3.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/myisam_tb4.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/sp_tb.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_03.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated results
mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
  "--echo" instead of SQL command.
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
  Adjustment to new storage place of infile
  + correct formatting.
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Backport from 5.1 + correct formatting.
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
  Minor improvements + correct formatting.
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
  Backport from 5.1 + correct formatting
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
  Backport from 5.1. + correct formatting
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
  Cleanup
mysql-test/suite/funcs_1/t/is_basics_mixed.test:
  Adjustment to new storage place of outfile.
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
  Cleanup
mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
  Cleanup
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Cleanup
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/views/func_view.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/views/views_master.inc:
  Cleanup
mysql-test/std_data/funcs_1/load_file.txt:
  New BitKeeper file ``mysql-test/std_data/funcs_1/load_file.txt''
 2008-03-31 19:48:02 +02:00
unknown
e61e4c2f24 Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 
into  five.local.lan:/work/merge/mysql-5.1-funcs_1


mysql-test/suite/funcs_1/cursors/cursors_master.test:
  Auto merged
BitKeeper/deleted/.del-innodb_triggers.result:
  Auto merged
BitKeeper/deleted/.del-memory_triggers.result:
  Auto merged
BitKeeper/deleted/.del-myisam_triggers.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  SCCS merged
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  SCCS merged
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  SCCS merged
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  SCCS merged
mysql-test/suite/funcs_1/t/innodb_storedproc.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc.test:
  Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  manual merge
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  manual merge
mysql-test/suite/funcs_1/r/myisam_views.result:
  manual merge
 2008-03-11 20:20:49 +01:00
unknown
67d529ed3b Post fix for 
WL#4203 Reorganize and fix the data dictionary tests of
        testsuite funcs_1
because the goal to fix
Bug#34532 Some funcs_1 tests do not clean up at end of testing
was partially missed.
Some minor additional modifications are for
   WL#4304 Cleanup in funcs_1 tests


BitKeeper/deleted/.del-innodb_triggers.result:
  Rename: mysql-test/suite/funcs_1/r/innodb_triggers.result -> BitKeeper/deleted/.del-innodb_triggers.result
BitKeeper/deleted/.del-memory_triggers.result:
  Rename: mysql-test/suite/funcs_1/r/memory_triggers.result -> BitKeeper/deleted/.del-memory_triggers.result
BitKeeper/deleted/.del-myisam_triggers.result:
  Rename: mysql-test/suite/funcs_1/r/myisam_triggers.result -> BitKeeper/deleted/.del-myisam_triggers.result
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/cursors/cursors_master.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Cleanup
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated results
mysql-test/suite/funcs_1/t/innodb_storedproc.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/t/memory_storedproc.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/t/myisam_storedproc.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
  Cleanup
mysql-test/suite/funcs_1/views/views_master.inc:
  Backport of file in 5.1 which got many fixes for instabilities
  and other improvements
 2008-03-11 19:54:35 +01:00
unknown
633cc34ca7 Post merge fixes after 
ChangeSet@1.2561, 2008-03-07 17:44:03+01:00, mleich@five.local.lan +132 -0
  Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
  into  five.local.lan:/work/merge/mysql-5.1-funcs_1
  MERGE: 1.1810.3473.24

ChangeSet@1.1810.3473.24, 2008-03-07
  WL#4203 Reorganize and fix the data dictionary tests of
          testsuite funcs_1

  1. Adjustment of expected results to modified server properties
  2. Add some tests of information_schema views
  3. Minor corrections and improvements


BitKeeper/deleted/.del-ndb__datadict.result:
  Delete: mysql-test/suite/funcs_1/r/ndb__datadict.result
BitKeeper/deleted/.del-ndb__datadict.test:
  Delete: mysql-test/suite/funcs_1/t/ndb__datadict.test
BitKeeper/deleted/.del-ndb__load.test:
  Delete: mysql-test/suite/funcs_1/t/ndb__load.test
BitKeeper/deleted/.del-ndb__load.result:
  Delete: mysql-test/suite/funcs_1/r/ndb__load.result
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
  Make the results independend of amount of preceding tests.
mysql-test/suite/funcs_1/datadict/processlist_val.inc:
  Correct the cleanup
mysql-test/suite/funcs_1/r/charset_collation_1.result:
  Updated results
mysql-test/suite/funcs_1/r/charset_collation_2.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc.result:
  Updated results
mysql-test/suite/funcs_1/r/is_basics_mixed.result:
  Updated results
mysql-test/suite/funcs_1/r/is_character_sets.result:
  Updated results
mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result:
  Updated results
mysql-test/suite/funcs_1/r/is_collations.result:
  Updated results
mysql-test/suite/funcs_1/r/is_column_privileges.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_is.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_mysql.result:
  Updated results
mysql-test/suite/funcs_1/r/is_key_column_usage.result:
  Updated results
mysql-test/suite/funcs_1/r/is_routines.result:
  Updated results
mysql-test/suite/funcs_1/r/is_schema_privileges.result:
  Updated results
mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result:
  Updated results
mysql-test/suite/funcs_1/r/is_schemata.result:
  Updated results
mysql-test/suite/funcs_1/r/is_statistics.result:
  Updated results
mysql-test/suite/funcs_1/r/is_statistics_mysql.result:
  Updated results
mysql-test/suite/funcs_1/r/is_table_constraints.result:
  Updated results
mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result:
  Updated results
mysql-test/suite/funcs_1/r/is_table_privileges.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_is.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_mysql.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_triggers.result:
  Updated results
mysql-test/suite/funcs_1/r/is_user_privileges.result:
  Updated results
mysql-test/suite/funcs_1/r/is_views.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_storedproc.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_storedproc_02.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_storedproc_03.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_storedproc_10.result:
  Updated results
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result:
  Updated results
mysql-test/suite/funcs_1/r/processlist_priv_ps.result:
  Updated results
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
  Updated results
mysql-test/suite/funcs_1/r/processlist_val_ps.result:
  Updated results
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
  Set subtest checking a no more reserved keyword
  to comment.
mysql-test/suite/funcs_1/t/disabled.def:
  ndb__datadict is dropped. The checks are done in
  other scripts.
mysql-test/suite/funcs_1/t/is_routines.test:
  Correction of comment
mysql-test/suite/funcs_1/t/is_triggers.test:
  Adjustment to changes in privilege system between
  MySQL 5.0 and 5.1.
mysql-test/suite/funcs_1/t/is_views.test:
  Correction of comment.
mysql-test/suite/funcs_1/t/processlist_priv_no_prot.test:
  Correction of comment.
mysql-test/suite/funcs_1/t/processlist_priv_ps.test:
  Correction of comment.
mysql-test/suite/funcs_1/t/processlist_val_no_prot.test:
  Correction of comment.
mysql-test/suite/funcs_1/t/processlist_val_ps.test:
  Correction of comment.
mysql-test/suite/funcs_1/r/is_engines.result:
  Expected results
mysql-test/suite/funcs_1/r/is_engines_archive.result:
  Expected results
mysql-test/suite/funcs_1/r/is_engines_blackhole.result:
  Expected results
mysql-test/suite/funcs_1/r/is_engines_csv.result:
  Expected results
mysql-test/suite/funcs_1/r/is_engines_federated.result:
  Expected results
mysql-test/suite/funcs_1/r/is_engines_innodb.result:
  Expected results
mysql-test/suite/funcs_1/r/is_engines_memory.result:
  Expected results
mysql-test/suite/funcs_1/r/is_engines_merge.result:
  Expected results
mysql-test/suite/funcs_1/r/is_engines_myisam.result:
  Expected results
mysql-test/suite/funcs_1/t/is_engines.test:
  Test of information_schema.engines
mysql-test/suite/funcs_1/t/is_engines_archive.test:
  Test of information_schema.engines
      Variant for ARCHIVE
mysql-test/suite/funcs_1/t/is_engines_blackhole.test:
  Test of information_schema.engines
      Variant for BLACKHOLE
mysql-test/suite/funcs_1/t/is_engines_csv.test:
  Test of information_schema.engines
      Variant for CSV
mysql-test/suite/funcs_1/t/is_engines_federated.test:
  Test of information_schema.engines
      Variant for FEDERATED
mysql-test/suite/funcs_1/t/is_engines_innodb.test:
  Test of information_schema.engines
      Variant for InnoDB
mysql-test/suite/funcs_1/t/is_engines_memory.test:
  Test of information_schema.engines
      Variant for MEMORY
mysql-test/suite/funcs_1/t/is_engines_merge.test:
  Test of information_schema.engines
      Variant for MERGGE
mysql-test/suite/funcs_1/t/is_engines_myisam.test:
  Test of information_schema.engines
      Variant for MyISAM
mysql-test/suite/funcs_1/t/is_engines_ndb.test:
  Test of information_schema.engines
      Variant for NDB
mysql-test/suite/funcs_1/t/is_events.test:
  Test for information_schema.events
mysql-test/suite/funcs_1/r/is_engines_ndb.result:
  Expected results
mysql-test/suite/funcs_1/r/is_events.result:
  Expected results
 2008-03-07 20:18:14 +01:00
unknown
71fb657743 Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 
into  five.local.lan:/work/merge/mysql-5.1-funcs_1


BitKeeper/deleted/.del-create_database.inc:
  Auto merged
BitKeeper/deleted/.del-create_user_lowest_priv.inc:
  Auto merged
BitKeeper/deleted/.del-create_user_no_super.inc:
  Auto merged
BitKeeper/deleted/.del-datadict_master.inc:
  Auto merged
BitKeeper/deleted/.del-datadict_show_schema.inc:
  Auto merged
BitKeeper/deleted/.del-datadict_show_table_design.inc:
  Auto merged
BitKeeper/deleted/.del-datadict_tables.inc:
  Auto merged
BitKeeper/deleted/.del-datadict_tables_error.inc:
  Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1.inc:
  Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1049.inc:
  Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1051.inc:
  Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1146.inc:
  Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1288.inc:
  Auto merged
BitKeeper/deleted/.del-innodb__datadict.result:
  Auto merged
BitKeeper/deleted/.del-innodb__datadict.test:
  Auto merged
BitKeeper/deleted/.del-innodb__load.result:
  Auto merged
BitKeeper/deleted/.del-innodb__load.test:
  Auto merged
BitKeeper/deleted/.del-memory__datadict.result:
  Auto merged
BitKeeper/deleted/.del-memory__datadict.test:
  Auto merged
BitKeeper/deleted/.del-memory__load.result:
  Auto merged
BitKeeper/deleted/.del-memory__load.test:
  Auto merged
BitKeeper/deleted/.del-myisam__datadict.result:
  Auto merged
BitKeeper/deleted/.del-myisam__datadict.test:
  Auto merged
BitKeeper/deleted/.del-myisam__load.result:
  Auto merged
BitKeeper/deleted/.del-myisam__load.test:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb1.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb2.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb3.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb4.inc:
  Auto merged
mysql-test/suite/funcs_1/include/sp_tb.inc:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_bitdata.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_cursors.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_bitdata.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_cursors.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
  Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1044.inc:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_bitdata.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_cursors.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
  Auto merged
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_07.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_08.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
  Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_02.test:
  Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_03.test:
  Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_06.test:
  Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_07.test:
  Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_08.test:
  Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_10.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
  Auto merged
mysql-test/suite/funcs_1/t/innodb_bitdata.test:
  SCCS merged
mysql-test/suite/funcs_1/t/innodb_cursors.test:
  SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_0102.test:
  SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_03.test:
  SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
  SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_08.test:
  SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_09.test:
  SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test:
  SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_frkey.test:
  SCCS merged
mysql-test/suite/funcs_1/t/innodb_views.test:
  SCCS merged
mysql-test/suite/funcs_1/t/memory_bitdata.test:
  SCCS merged
mysql-test/suite/funcs_1/t/memory_cursors.test:
  SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_0102.test:
  SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_03.test:
  SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_0407.test:
  SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_08.test:
  SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_09.test:
  SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_1011ext.test:
  SCCS merged
mysql-test/suite/funcs_1/t/memory_views.test:
  SCCS merged
mysql-test/suite/funcs_1/t/myisam_cursors.test:
  SCCS merged
mysql-test/suite/funcs_1/t/myisam_trig_0102.test:
  SCCS merged
mysql-test/suite/funcs_1/t/myisam_trig_0407.test:
  ur
mysql-test/suite/funcs_1/t/myisam_views.test:
  ur
mysql-test/suite/funcs_1/r/myisam_views.result:
  Manual merge
 2008-03-07 17:44:03 +01:00
unknown
d6e42aace3 WL#4203 Reorganize and fix the data dictionary tests of 
testsuite funcs_1
1. Fix the following bugs
   Bug#30440 "datadict" tests (all engines) fail: Character sets depend on configuration
      Solution: Test variants charset_collation_* adjusted to different builds
   Bug#32603 "datadict" tests (all engines) fail in "community" tree: "PROFILING" table
      Solution: Excluding "PROFILING" table from queries
   Bug#33654 "slow log" is missing a line
      Solution: Unify the content of the fields TABLES.TABLE_ROWS and
                STATISTICS.CARDINALITY within result sets
   Bug#34532 Some funcs_1 tests do not clean up at end of testing
      Solution: DROP objects/reset global server variables modified during testing
                + let tests missing implementation end before loading of tables
   Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results
      Solution: Cut <engine>__datadict tests into smaller tests + generate new results.
   Bug#33599 INFORMATION_SCHEMA.STATISTICS got a new column INDEX_COMMENT: tests fail (2)
      Generation of new results during post merge fix
   Bug#33600 CHARACTER_OCTET_LENGTH is now CHARACTER_MAXIMUM_LENGTH * 4
      Generation of new results during post merge fix
   Bug#33631 Platform-specific replace of CHARACTER_MAXIMUM_LENGTH broken by 4-byte encoding
      Generation of new results during post merge fix
      + removal of platform-specific replace routine (no more needed)
2. Restructure the tests
   - Test not more than one INFORMATION_SCHEMA view per testscript
   - Separate tests of I_S view layout+functionality from content related to the
     all time existing databases "information_schema", "mysql" and "test"
   - Avoid storage engine related variants of tests which are not sensible to
     storage engines at all.
3. Reimplement or add some subtests + cleanup
   There is a some probability that even the reviewed changeset
   - does not fix all bugs from above   or
   - contains new bugs which show up on some platforms <> Linux or on one of
     the various build types
4. The changeset contains fixes according to
   - one code review
   - minor bugs within testing code found after code review (accepted by reviewer)
   - problems found during tests with 5.0.56 in build environment


mysql-test/suite/funcs_1/t/innodb_storedproc_02.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/innodb_storedproc_03.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/innodb_storedproc_06.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/innodb_storedproc_07.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/innodb_storedproc_08.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/innodb_storedproc_10.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/storedproc/storedproc_07.inc:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/storedproc/storedproc_08.inc:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
  Change mode to -rw-rw-r--
BitKeeper/deleted/.del-innodb__load.test:
  Delete: mysql-test/suite/funcs_1/t/innodb__load.test
BitKeeper/deleted/.del-innodb__load.result:
  Delete: mysql-test/suite/funcs_1/r/innodb__load.result
BitKeeper/deleted/.del-myisam__load.test:
  Delete: mysql-test/suite/funcs_1/t/myisam__load.test
BitKeeper/deleted/.del-memory__load.test:
  Delete: mysql-test/suite/funcs_1/t/memory__load.test
BitKeeper/deleted/.del-memory__load.result:
  Delete: mysql-test/suite/funcs_1/r/memory__load.result
BitKeeper/deleted/.del-myisam__load.result:
  Delete: mysql-test/suite/funcs_1/r/myisam__load.result
BitKeeper/deleted/.del-create_database.inc:
  Delete: mysql-test/suite/funcs_1/include/create_database.inc
BitKeeper/deleted/.del-create_user_lowest_priv.inc:
  Delete: mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
BitKeeper/deleted/.del-create_user_no_super.inc:
  Delete: mysql-test/suite/funcs_1/include/create_user_no_super.inc
BitKeeper/deleted/.del-datadict_help_tables_build.result:
  Delete: mysql-test/suite/funcs_1/r/datadict_help_tables_build.result
BitKeeper/deleted/.del-datadict_help_tables_build.test:
  Delete: mysql-test/suite/funcs_1/t/datadict_help_tables_build.test
BitKeeper/deleted/.del-datadict_help_tables_dev.result:
  Delete: mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result
BitKeeper/deleted/.del-datadict_help_tables_dev.test:
  Delete: mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test
BitKeeper/deleted/.del-datadict_master.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_master.inc
BitKeeper/deleted/.del-datadict_show_schema.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
BitKeeper/deleted/.del-datadict_show_table_design.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
BitKeeper/deleted/.del-datadict_tables.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables.inc
BitKeeper/deleted/.del-datadict_tables_error.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
BitKeeper/deleted/.del-datadict_tables_error_1.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
BitKeeper/deleted/.del-datadict_tables_error_1044.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
BitKeeper/deleted/.del-datadict_tables_error_1049.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
BitKeeper/deleted/.del-datadict_tables_error_1051.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
BitKeeper/deleted/.del-datadict_tables_error_1146.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
BitKeeper/deleted/.del-datadict_tables_error_1288.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
BitKeeper/deleted/.del-innodb__datadict.result:
  Delete: mysql-test/suite/funcs_1/r/innodb__datadict.result
BitKeeper/deleted/.del-innodb__datadict.test:
  Delete: mysql-test/suite/funcs_1/t/innodb__datadict.test
BitKeeper/deleted/.del-memory__datadict.test:
  Delete: mysql-test/suite/funcs_1/t/memory__datadict.test
BitKeeper/deleted/.del-myisam__datadict.result:
  Delete: mysql-test/suite/funcs_1/r/myisam__datadict.result
BitKeeper/deleted/.del-myisam__datadict.test:
  Delete: mysql-test/suite/funcs_1/t/myisam__datadict.test
BitKeeper/deleted/.del-memory__datadict.result:
  Delete: mysql-test/suite/funcs_1/r/memory__datadict.result
mysql-test/suite/funcs_1/README.txt:
  Cleanup in description
mysql-test/suite/funcs_1/include/memory_tb1.inc:
  Move setting of variables into the caller scripts
mysql-test/suite/funcs_1/include/memory_tb2.inc:
  Move setting of variables into the caller scripts
mysql-test/suite/funcs_1/include/memory_tb3.inc:
  Move setting of variables into the caller scripts
mysql-test/suite/funcs_1/include/memory_tb4.inc:
  Move setting of variables into the caller scripts
mysql-test/suite/funcs_1/include/sp_tb.inc:
  Remove outdated comment
mysql-test/suite/funcs_1/r/innodb_bitdata.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_cursors.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_bitdata.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_cursors.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_03.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_bitdata.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_cursors.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated results
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
  Move setting of variables into the caller scripts
mysql-test/suite/funcs_1/t/innodb_bitdata.test:
  Cleanup
mysql-test/suite/funcs_1/t/innodb_cursors.test:
  Cleanup
mysql-test/suite/funcs_1/t/innodb_trig_0102.test:
  Cleanup
mysql-test/suite/funcs_1/t/innodb_trig_03.test:
  Cleanup
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
  Cleanup
mysql-test/suite/funcs_1/t/innodb_trig_08.test:
  Cleanup
mysql-test/suite/funcs_1/t/innodb_trig_09.test:
  Cleanup
mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test:
  Cleanup
mysql-test/suite/funcs_1/t/innodb_trig_frkey.test:
  Cleanup
mysql-test/suite/funcs_1/t/innodb_views.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_bitdata.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_cursors.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_trig_0102.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_trig_03.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_trig_0407.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_trig_08.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_trig_09.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_trig_1011ext.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_views.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_bitdata.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_cursors.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_0102.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_03.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_0407.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_08.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_09.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_views.test:
  Cleanup
mysql-test/suite/funcs_1/t/charset_collation_1.test:
  Check content of information_schema views
     character_sets, collations,
     collation_character_set_applicability
  Build variant 1
mysql-test/suite/funcs_1/t/charset_collation_2.test:
  Check content of information_schema views
     character_sets, collations,
     collation_character_set_applicability
  Build variant 2
mysql-test/suite/funcs_1/t/charset_collation_3.test:
  Check content of information_schema views
     character_sets, collations,
     collation_character_set_applicability
  Build variant 3
mysql-test/suite/funcs_1/t/is_basics_mixed.test:
  Test some basic properties which are independend of the storage
  engine used for the creation of tables.
mysql-test/suite/funcs_1/t/is_character_sets.test:
  Tests related to functionality of
  information_schema.character_sets
mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test:
  Tests related to functionality of
  information_schema.collation_character_set_applicability
mysql-test/suite/funcs_1/t/is_collations.test:
  Tests related to functionality of
  information_schema.collations
mysql-test/suite/funcs_1/t/is_column_privileges.test:
  Tests related to functionality of
  information_schema.column_privileges
mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test:
  Check content of information_schema.column_privileges about databases
  mysql and test
mysql-test/suite/funcs_1/t/is_columns.test:
  Tests related to functionality of
  information_schema.columns
mysql-test/suite/funcs_1/t/is_columns_innodb.test:
  Check content of information_schema.columns when some
  tables are preloaded
  Variant for InnoDB
mysql-test/suite/funcs_1/t/is_columns_is.test:
  Check content of information_schema.columns about schema
  information_schema
mysql-test/suite/funcs_1/t/is_columns_memory.test:
  Check content of information_schema.columns when some
  tables are preloaded
  Variant for MEMORY
mysql-test/suite/funcs_1/t/is_columns_myisam.test:
  Check content of information_schema.columns when some
  tables are preloaded
  Variant for MyISAM
mysql-test/suite/funcs_1/t/is_columns_mysql.test:
  Check content of information_schema.columns about schema
  mysql
mysql-test/suite/funcs_1/t/is_columns_ndb.test:
  Check content of information_schema.columns when some
  tables are preloaded
  Variant for NDB
mysql-test/suite/funcs_1/t/is_key_column_usage.test:
  Tests related to functionality of
  information_schema.key_column_usage
mysql-test/suite/funcs_1/t/is_routines.test:
  Tests related to functionality of
  information_schema.routines
mysql-test/suite/funcs_1/t/is_schema_privileges.test:
  Tests related to functionality of
  information_schema.schema_privileges
mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test:
  Check content of information_schema.schema_privileges about schemas
  information_schema, mysql and test
mysql-test/suite/funcs_1/t/is_schemata.test:
  Tests related to functionality of
  information_schema.schemata
mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test:
  Check content of information_schema.schemata about schemas
  information_schema, mysql and test
mysql-test/suite/funcs_1/t/is_statistics.test:
  Tests related to functionality of
  information_schema.statistics
mysql-test/suite/funcs_1/t/is_statistics_is.test:
  Check content of information_schema.statistics about schema
  information_schema
mysql-test/suite/funcs_1/t/is_statistics_mysql.test:
  Check content of information_schema.statistics about schema
  mysql
mysql-test/suite/funcs_1/t/is_table_constraints.test:
  Tests related to functionality of
  information_schema.table_constraints
mysql-test/suite/funcs_1/t/is_table_constraints_is.test:
  Check content of information_schema.table_constraints about schema
  information_schema
mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test:
  Check content of information_schema.table_constraints about schema
  mysql
mysql-test/suite/funcs_1/t/is_table_privileges.test:
  Tests related to functionality of
  information_schema.table_privileges
mysql-test/suite/funcs_1/datadict/basics_mixed1.inc:
  Auxiliary script
mysql-test/suite/funcs_1/datadict/basics_mixed2.inc:
  Auxiliary script
mysql-test/suite/funcs_1/include/cleanup.inc:
  Auxiliary script
mysql-test/suite/funcs_1/r/charset_collation_1.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/charset_collation_2.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/charset_collation_3.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_basics_mixed.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_character_sets.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_collations.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_column_privileges.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_column_privileges_is_mysql_test.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_columns.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_columns_is.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_columns_memory.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_columns_mysql.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_columns_ndb.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_key_column_usage.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_routines.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_schema_privileges.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_schemata.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_statistics.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_statistics_is.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_statistics_mysql.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_table_constraints.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_table_constraints_is.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_table_privileges.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_tables.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_tables_innodb.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_tables_is.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_tables_memory.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_tables_myisam.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_tables_mysql.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_triggers.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_user_privileges.result:
  Expected result for new test
mysql-test/suite/funcs_1/r/is_views.result:
  Expected result for new test
mysql-test/suite/funcs_1/t/is_tables.test:
  Tests related to functionality of
  information_schema.tables
mysql-test/suite/funcs_1/t/is_tables_innodb.test:
  Check content of information_schema.tables when some
  tables are preloaded
  Variant for InnoDB
mysql-test/suite/funcs_1/t/is_tables_is.test:
  Check content of information_schema.tables about schema
  information_schema
mysql-test/suite/funcs_1/t/is_tables_memory.test:
  Check content of information_schema.tables when some
  tables are preloaded
  Variant for MEMORY
mysql-test/suite/funcs_1/t/is_tables_myisam.test:
  Check content of information_schema.tables when some
  tables are preloaded
  Variant for MyISAM
mysql-test/suite/funcs_1/t/is_tables_mysql.test:
  Check content of information_schema.tables about schema
  mysql
mysql-test/suite/funcs_1/t/is_tables_ndb.test:
  Check content of information_schema.tables when some
  tables are preloaded
  Variant for NDB
mysql-test/suite/funcs_1/t/is_triggers.test:
  Tests related to functionality of
  information_schema.triggers
mysql-test/suite/funcs_1/t/is_user_privileges.test:
  Tests related to functionality of
  information_schema.user_privileges
mysql-test/suite/funcs_1/t/is_views.test:
  Tests related to functionality of
  information_schema.views
mysql-test/suite/funcs_1/datadict/basics_mixed3.inc:
  Auxiliary script
mysql-test/suite/funcs_1/datadict/charset_collation.inc:
  Auxiliary script
mysql-test/suite/funcs_1/datadict/columns.inc:
  Auxiliary script
mysql-test/suite/funcs_1/datadict/datadict.pre:
  Auxiliary script
mysql-test/suite/funcs_1/datadict/is_table_query.inc:
  Auxiliary script
mysql-test/suite/funcs_1/datadict/statistics.inc:
  Auxiliary script
mysql-test/suite/funcs_1/datadict/table_constraints.inc:
  Auxiliary script
mysql-test/suite/funcs_1/datadict/tables1.inc:
  Auxiliary script
mysql-test/suite/funcs_1/datadict/tables2.inc:
  Auxiliary script
 2008-03-07 17:33:07 +01:00
unknown
4c5fb788f8 Fixed differences in STATE in result file for bug#34190. 
BitKeeper/etc/ignore:
  Added mysql-test/suite/funcs_1.tar.zip to the ignore list
 2008-02-06 11:02:45 +01:00
unknown
705d58f8a6 Merge five.local.lan:/work/merge/mysql-5.0-build-30418 
into  five.local.lan:/work/merge/mysql-5.1-build-31610


mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
  Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Auto merged
 2007-11-21 15:06:38 +01:00
unknown
b6c381053f This changeset fixes 
Bug#31567 "datadict" tests (all engines) fail:
             Reference protocol is non-standard build
   Bug#30418 "datadict" tests (all engines) fail:
             Dependency on the host name for ordering   
Modifications:
   1. The standard builds (build team) do not contain
      the collation 'utf8_general_cs'.
      The common developer builds (compuile-....-max)
      contain this collation.
      Solution fitting to both build variants:
         Exclude the collation 'utf8_general_cs' from
         result sets.
   2. Use mysqltest builtin sorting of result set for
      the statement where the hostname affects the
      row order.


mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Exclude collation 'utf8_general_cs' from result set.
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
  Use mysqltest builtin sorting of result set.
mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
  Exclude collation 'utf8_general_cs' from result set.
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated  results
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated  results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated  results
 2007-11-21 13:50:17 +01:00
unknown
facf6305a3 Fix for 
Bug#32153 Status output differs - scheduling ?
Modifications:
1. Introduce additional poll routines + adjust queries 
   as fixes for Bug#32153 and another non reported bug
   found during stability testing
2. Replace builtin poll routines by wait_condition.inc.
3. Update the comments


mysql-test/suite/funcs_1/datadict/processlist_val.inc:
  Fixes, details are in changeset comment
mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result:
  Updated results
mysql-test/suite/funcs_1/r/b_processlist_val_ps.result:
  Updated results
 2007-11-09 14:08:12 +01:00