unknown 6ee54d733c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 ...

into  neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/ndb_autodiscover2.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_drop_temp.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
client/mysqltest.c:
  Manual merge
mysql-test/t/mysqltest.test:
  Manual merge

2005-09-01 17:21:03 +02:00

..

check_var_limit.inc

Add detection of in_addr_t

2003-08-28 06:08:17 +03: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

endspace.inc

Move common trailing space checks into an include file.

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

have_archive.inc

Added tests for archive. Cleaned up a merge mistake and added some information on how well archive compresses.

2004-05-25 13:27:01 -07: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_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_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_gbk.inc

ctype-gbk.c:

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

have_geometry.inc

WL#1163 (Make spatial code separable for other parts)

2004-05-27 20:31:30 +05:00

have_innodb.inc

changes to make things work in the max version

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

have_isam.inc

Cleanup after last merge

2001-10-08 07:24:04 +03:00

have_lowercase0.inc

ps_conv.inc:

2005-08-18 22:27:12 +02:00

have_multi_ndb.inc

Fix for Bug #8753 Invalid schema object version after dropping index

2005-03-07 10:21:38 +01:00

have_ndb.inc

have test suite continue even if ndbcluster fails to start if --force flag is set

2005-02-07 17:46:52 +01:00

have_openssl_1.inc

Openssl test

2003-03-11 13:41:53 +04:00

have_openssl.inc

changes to make things work in the max version

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

have_outfile.inc

Bug#8191 - SELECT INTO OUTFILE insists on FROM clause

2005-05-08 22:56:58 +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_ujis.inc

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

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

master-slave.inc

Do not give an error when the user does START SLAVE on an already

2003-03-03 23:12:17 +01:00

mysqltest_while.inc

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

2005-07-15 17:51:43 +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

ps_conv.inc:

2005-08-18 22:27:12 +02:00

ps_create.inc

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

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

ps_modify1.inc

Small bug fix

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

ps_modify.inc

Enable REPLACE ... SELECT in prepared statements.

2004-10-30 17:17:52 +04:00

ps_query.inc

BUG#8807 Select crash server

2005-03-30 12:14:37 +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

rpl_stmt_seq.inc

WL#2076: Added if(...) construct to mysqltest

2005-06-16 16:56:03 +02:00

system_db_struct.inc

fixed BUG #2874 "Grant table bug" and

2004-03-10 22:54:07 +04:00

test_outfile.inc

Bug#8191 - SELECT INTO OUTFILE insists on FROM clause

2005-05-08 22:56:58 +01:00

windows.inc

Fix handling of filenames that start the same as reserved filenames

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