unknown 0517aa59ed Merge bk-internal.mysql.com:/home/bk/mysql-5.1 ...

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener


Makefile.am:
  Auto merged
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqlbug.sh:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
mysql-test/r/warnings.result:
  Manual merge.
mysql-test/t/warnings.test:
  Manual merge.
strings/ctype-extra.c:
  Manual merge.

2007-01-07 09:31:49 -05:00

..

analyze_failure_sync_with_master.test

Add analyze_testcase_failure which is called when mysqltest has failed

2006-10-24 17:36:46 +02:00

big_test.inc

Moved some old test and added a new test to only be run with mysql-test-run --big

2005-04-07 19:24:14 +03:00

check_var_limit.inc

Add detection of in_addr_t

2003-08-28 06:08:17 +03:00

check-testcase.test

Print names of testcases that failed check_testcase, this makes it easier

2006-10-08 17:48:01 +02:00

common-tests.inc

Added --pipe option for faster compile

2006-06-06 20:21:36 +03:00

concurrent.inc

This changeset belongs to

2006-08-16 14:58:49 +02:00

ctype_common.inc

Privileges columns were removed from output to be able

2004-12-10 17:58:13 +04:00

ctype_filesort.inc

bug#7284: strnxfrm returns different results for equal strings

2005-01-13 18:12:04 +04:00

ctype_innodb_like.inc

ctype_innodb_like.inc:

2005-07-06 17:16:22 +05:00

ctype_like_escape.inc

Add printout of file in which warning was detected

2006-10-06 00:57:10 +02:00

deadlock.inc

This changeset belongs to

2006-08-16 14:58:49 +02:00

endspace.inc

Move common trailing space checks into an include file.

2004-12-01 19:25:05 +04:00

federated_cleanup.inc

This is the same patch as 1.1937, with small variable declaration changes, memory

2005-07-15 17:33:47 -07:00

federated.inc

Remove compiler warnings

2006-11-20 22:42:06 +02:00

get_binlog_dump_thread_id.inc

BUG#18906 Test case rpl_temporary fails when using --vardir option

2006-04-09 13:27:53 +03:00

gis_generic.inc

Bug#17728 tests that fails are: ndb_gis rpl_ndb_multi_update2

2006-03-03 11:52:52 +01:00

handler.inc

Merge chilla.local:/home/mydev/mysql-5.1--main

2006-09-14 21:44:17 +02:00

have_archive.inc

Removed ifdef need.

2006-09-19 13:58:12 -07:00

have_big5.inc

"like" did not work in some cases with character set big5

2003-12-24 16:59:48 +04:00

have_binlog_format_mixed_or_row.inc

Fixed failure with rpl_truncate_7ndb.test when using statement based replication.

2006-06-22 22:44:21 +03:00

have_binlog_format_mixed_or_statement.inc

Changes made according to HLD/LLD.

2006-08-30 10:22:43 +03:00

have_binlog_format_mixed.inc

Changes made according to HLD/LLD.

2006-08-30 10:22:43 +03:00

have_binlog_format_row.inc

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

have_binlog_format_statement.inc

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

have_blackhole.inc

Removed ifdef need.

2006-09-19 13:58:12 -07:00

have_case_sensitive_file_system.inc

Bugs#17647: Trouble with "create database"

2006-05-04 11:55:09 +05:00

have_compress.inc

added compress/uncompress function

2003-04-09 20:50:30 -04:00

have_cp932.inc

Added cp932 character set

2005-05-05 10:36:17 -07:00

have_cp1250_ch.inc

Bug#8840 Empty string comparison and character set 'cp1250'

2005-03-03 14:15:37 +04:00

have_crypt.inc

Fixes for Netware

2003-01-28 08:38:28 +02:00

have_csv.inc

Removed ifdef need.

2006-09-19 13:58:12 -07:00

have_debug.inc

Robustness feature.

2004-06-20 19:11:02 +02:00

have_eucjpms.inc

Skip cp932 and eucjpms tests when the character sets are not compiled.

2005-02-01 14:37:51 +04:00

have_euckr.inc

Bug#15377 Valid multibyte sequences are truncated on INSERT

2005-12-09 16:37:58 +04:00

have_example_plugin.inc

Add support for loading example plugin and add plugin.test

2006-12-15 00:09:56 +01:00

have_exampledb.inc

Removed ifdef need.

2006-09-19 13:58:12 -07:00

have_federated_db.inc

Removed ifdef need.

2006-09-19 13:58:12 -07:00

have_gb2312.inc

Bug#15377 Valid multibyte sequences are truncated on INSERT

2005-12-09 16:37:58 +04:00

have_gbk.inc

ctype-gbk.c:

2005-07-22 21:06:02 +05:00

have_geometry.inc

Add DROP TABLE before trying to create view (in mysqldump)

2005-10-27 22:45:18 +03:00

have_innodb.inc

Removed ifdef need.

2006-09-19 13:58:12 -07:00

have_latin2_ch.inc

Bug#17374: select ... like 'A%' operator fails to find value on columuns with key

2006-03-20 16:28:25 +04:00

have_lowercase0.inc

Backport test cases fixes from 5.0

2006-10-19 10:54:23 +02:00

have_multi_ndb.inc

Wait for mysqld connected to NDB to come out of read only mode

2006-12-22 13:34:23 +01:00

have_ndb_extra.inc

wl2325 wl2324

2006-01-12 19:51:02 +01:00

have_ndb.inc

Wait for mysqld connected to NDB to come out of read only mode

2006-12-22 13:34:23 +01:00

have_ndbapi_examples.inc

Fixed ndbapi-examples, and added tests for mysql-test-run.pl

2006-09-01 15:14:50 +02:00

have_openssl.inc

changes to make things work in the max version

2001-10-04 15:42:25 -06:00

have_outfile.inc

Make it possible to run mysql-test-run.pl with default test suite in different vardir.

2006-01-24 08:30:54 +01:00

have_partition.inc

Bug# 16718 partitioning support status variable has incorrect name

2006-01-23 08:42:32 -06:00

have_query_cache.inc

A lot of fixes for prepared statements (PS):

2004-10-26 19:30:01 +03:00

have_row_based.inc

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

have_sjis.inc

#3290: Can't convert sjis&ujis half-width katakana correctly

2004-03-25 14:29:56 +04:00

have_tis620.inc

Bug 1552:

2003-12-25 20:11:01 +04:00

have_ucs2.inc

Character set sets now check if required non-dynamic charsets were really compiled

2003-05-23 15:10:05 +05:00

have_udf.inc

Add support for loading example plugin and add plugin.test

2006-12-15 00:09:56 +01:00

have_ujis.inc

Character set sets now check if required non-dynamic charsets were really compiled

2003-05-23 15:10:05 +05:00

im_check_env.inc

Fixed a LOT of compiler warnings

2006-11-27 01:47:38 +02:00

index_merge1.inc

Merge april.(none):/home/svoj/devel/mysql/BUG20256/mysql-5.0-engines

2006-09-12 18:42:10 +05:00

index_merge2.inc

Merge chilla.local:/home/mydev/mysql-5.1--main

2006-09-14 21:44:17 +02:00

index_merge_2sweeps.inc

This changeset belongs to

2006-08-16 14:58:49 +02:00

index_merge_ror_cpk.inc

This changeset belongs to

2006-08-16 14:58:49 +02:00

index_merge_ror.inc

Merge mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.0-engines

2006-12-26 18:04:31 +04:00

innodb_rollback_on_timeout.inc

Added innodb_rollback_on_timeout option to restore the 4.1

2006-12-19 16:57:51 -07:00

is_debug_build.inc

Post-review fixes, mainly fixing all print() methods for sp_instr* classes.

2005-11-18 16:30:27 +01:00

loaddata_autocom.inc

Post-merge fixes:

2006-09-13 15:37:35 -06:00

master-slave-end.inc

new files

2006-04-12 15:56:29 +02:00

master-slave-reset.inc

Bug#19995 (Extreneous table maps generated for statements that do not generate rows):

2006-05-31 19:21:52 +02:00

master-slave.inc

Update mysqltest to latest version

2006-10-03 15:33:44 +02:00

mix1.inc

Merge siva.hindu.god:/usr/home/tim/m/bk/50-build

2006-12-20 15:46:36 -07:00

mix2.inc

Fixed portablity problem

2006-11-28 05:43:30 +02:00

mysqltest-x.inc

Bug#12959 mysqltest crashes if testcase passed with -x option

2005-09-05 16:50:32 +02:00

ndb_backup.inc

Fix test cases to work with non-standard --vardir.

2006-02-22 10:07:54 +01:00

ndb_default_cluster.inc

Bug #20820 auto inc table not handled correctly when restored from cluster backup

2006-07-06 18:50:44 +02:00

ndb_not_readonly.inc

Add the missing file

2006-12-22 13:57:33 +01:00

ndb_restore_master.inc

Test updates

2006-02-16 16:33:46 +01:00

ndb_restore_slave_eoption.inc

New test to satisfy some of the 5.1 CR test plan

2006-03-09 03:37:25 +01:00

ndb_setup_slave.inc

Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema

2006-12-01 15:49:07 +01:00

not_as_root.inc

Use "eval select" when evaluating the environment variable "$MYSQL_TEST_ROOT"

2006-04-24 12:01:16 +02:00

not_embedded.inc

After merge fixes

2003-05-21 21:39:58 +03:00

not_ndb_default.inc

Update 'abort_not_supported_test' to print a reason why the test was aborted

2006-07-19 14:25:52 +02:00

not_ndb.inc

wl2325 wl2324

2006-01-12 19:51:02 +01:00

not_openssl.inc

BUG#10589: des_encrypt functionality always return NULL

2005-06-17 18:07:46 +02:00

not_row_based.inc

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

not_valgrind.inc

WL#3337 (Events new architecture)

2006-07-17 16:52:45 +02:00

not_windows.inc

Update 'abort_not_supported_test' to print a reason why the test was aborted

2006-07-19 14:25:52 +02:00

parser_bug21114.inc

Bug#21114 (Foreign key creation fails to table with name format)

2006-11-02 11:01:53 -07:00

partition_1.inc

Fix test cases to work with non-standard --vardir.

2006-02-22 10:07:54 +01:00

partition_10.inc

WL #2604: Partition Management

2006-01-17 08:40:00 +01:00

partition_11.inc

WL #2604: Partition Management

2006-01-17 08:40:00 +01:00

partition_12.inc

WL #2604: Partition Management

2006-01-17 08:40:00 +01:00

partition_layout.inc

Fix test cases to work with non-standard --vardir.

2006-02-22 10:07:54 +01:00

ps_conv.inc

Merge mishka.local:/home/my/mysql-4.1

2005-08-25 06:55:48 +03:00

ps_create.inc

bug#10466: Datatype "timestamp" displays "YYYYMMDDHHMMSS" irrespective of display sizes.

2005-06-20 12:09:00 +02:00

ps_modify1.inc

Small bug fix

2004-12-13 21:00:43 +01:00

ps_modify.inc

Patch two (the final one) for Bug#7306 "the server side preparedStatement

2005-06-07 14:11:36 +04:00

ps_query.inc

Update mysqltest to latest version

2006-10-03 15:33:44 +02:00

ps_renew.inc

Results of WL#1856 "Conversion of client_test.c tests cases to mysqltest

2004-09-25 19:08:02 +04:00

query_cache.inc

Fixed portablity problem

2006-11-28 05:43:30 +02:00

read_many_rows.inc

This changeset belongs to

2006-08-16 19:29:49 +02:00

report-features.test

add --report-features to mysql-test-run.pl

2006-11-10 13:12:08 +01:00

rowid_order.inc

This changeset belongs to

2006-08-16 19:29:49 +02:00

rpl_multi_engine3.inc

Removing sleeps; rpl_row_basic_8partition falls from 2 minutes

2006-09-07 18:01:42 +02:00

rpl_multi_engine.inc

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

rpl_stmt_seq2.inc

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

rpl_stmt_seq.inc

Fix of 5.0 tree

2005-06-17 14:03:27 +02:00

safe_set_to_maybe_ro_var.inc

Bug#22067 rpl_rbr_to_sbr and some other fail if NDB is default storage

2006-09-15 17:25:13 +03:00

show_binlog_events.inc

Test fixes

2006-03-09 16:30:59 +01:00

show_msg80.inc

Update mysqltest to latest version

2006-10-03 15:33:44 +02:00

show_msg.inc

Update mysqltest to latest version

2006-10-03 15:33:44 +02:00

sp-vars.inc

Remove compiler warnings

2006-11-20 22:42:06 +02:00

strict_autoinc.inc

Bug#18908: ERROR 1406 (22001): Data too long for column :: using utf8

2006-10-30 10:14:03 +04:00

system_db_struct.inc

WL #3031

2006-12-11 11:44:03 -05:00

test_outfile.inc

Make it possible to run mysql-test-run.pl with default test suite in different vardir.

2006-01-24 08:30:54 +01:00

testdb_only.inc

WL#1420 convert NIST test for mysql

2005-01-26 10:19:28 +01:00

unsafe_binlog.inc

This changeset belongs to

2006-08-16 14:58:49 +02:00

varchar.inc

Fix bug #10802 Index is not used if table using BDB engine on HP-UX

2005-08-15 13:02:29 +04:00

wait_for_query_to_suceed.inc

Bug#18654 Test is timing-dependent and fails from scheduling effects (?)

2006-10-30 14:42:28 +01:00

wait_slave_status.inc

New file to remove sleeps in mysql-test-run (backported from 5.1)

2006-03-23 09:19:01 +01:00

wait_until_connected_again.inc

Increase time to wait for mysqld to get restarted(it will take some time when running in valgrind)

2006-09-28 11:53:42 +02:00

wait_until_rows_count.inc

binlog_row_binlog test gained some indeterministic checks with changes due to

2006-09-23 15:24:45 +03:00

windows.inc

Update 'abort_not_supported_test' to print a reason why the test was aborted

2006-07-19 14:25:52 +02:00