unknown f3919e9284 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 ...

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge


include/mysql.h:
  Auto merged
include/sql_common.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/ps.result:
  Manual merge.
mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
sql/sql_prepare.cc:
  Manual merge.
sql/table.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

2006-08-02 14:13:01 +04: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

Add new option "check-testcases" to mysql-test-run.pl

2006-01-26 17:54:34 +01:00

common-tests.inc

Post-merge fixes

2006-05-31 22:55:45 -07: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

Bug#13046: LIKE pattern matching using prefix

2005-09-21 23:10:51 +05: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

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

2005-07-15 17:33:47 -07: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

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

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

have_archive.inc

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

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

have_bdb.inc

changes to make things work in the max version

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

have_big5.inc

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

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

have_blackhole.inc

Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request. With this you can alter table to a type of table that would never store data. Its a /dev/null for a database.

2005-03-22 16:10:39 -08: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

This is the addition of the CSV engine "aka tina". Its an example engine that works as a plain text file.

2004-08-12 20:57:18 -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_exampledb.inc

Adding test cases for the example storage engine (so that you can test to see if it was built correctly).

2004-08-13 17:14:36 -07:00

have_federated_db.inc

-Added quote_data and needs_quotes (moved from federated handler.

2005-01-20 18:36:40 -08: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

changes to make things work in the max version

2001-10-04 15:42:25 -06: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

Detect comment with command using extra delimiter

2005-09-06 12:33:36 +02:00

have_multi_ndb.inc

WL#2930

2005-12-06 21:28:13 +01:00

have_ndb.inc

Make have_ndb.in portable

2006-04-24 12:00:11 +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_query_cache.inc

A lot of fixes for prepared statements (PS):

2004-10-26 19:30:01 +03: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 test to mysql-test-run.pl to see if the udf_example.so is availble. Set envioronment variable UDF_EXAMPLE_LIB if it is.

2006-04-27 16:32:40 +02: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

Fix for BUG#20716: SHOW INSTANCES statement causes races in IM tests.

2006-07-20 13:24:12 +04:00

im_check_os.inc

WL#2789 "Instance Manager: test using mysql-test-run testing framework"

2005-10-01 01:14:50 +04: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

master-slave.inc

WL#2930 Adding view and cursor 'protocols' to mysqltest

2005-10-31 12:25:08 +01:00

mysqltest_while.inc

BUG#11316 mysqltest, problems when assigning value with '#' to $variable

2005-07-15 17:51:43 +02:00

mysqltest-x.inc

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

2005-09-05 16:50:32 +02: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

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_openssl.inc

BUG#10589: des_encrypt functionality always return NULL

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

not_windows.inc

Skip two tests that fail on Windows that just reflect limitations of

2005-08-03 17:38:55 -07: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

WL#2930 Adding view and cursor 'protocols' to mysqltest

2005-10-31 12:25:08 +01: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

rpl_stmt_seq.inc

Fix of 5.0 tree

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

show_msg80.inc

Post review fixes

2005-06-16 12:46:09 +02:00

show_msg.inc

Improvement of the auxiliary routines include/show_msg*.inc

2005-06-15 19:16:17 +02:00

sourced1.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

sourced.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

sp-vars.inc

Patch for WL#2894: Make stored routine variables work

2005-12-07 17:01:17 +03:00

system_db_struct.inc

Add all SQL_MODE settings to proc table. (Bug #8902)

2005-03-08 17:40:43 -08: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

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_slave_status.inc

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

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

windows.inc

Fix handling of filenames that start the same as reserved filenames

2005-08-31 18:32:15 -07:00