unknown 2b53b711d8 Merge mysql.com:/home/timka/mysql/src/5.0-virgin ...

into  mysql.com:/home/timka/mysql/src/5.0-2486-merge


mysql-test/r/errors.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/fulltext_order_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/join_nested.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/errors.test:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/fulltext_order_by.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/join_nested.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/sql_insert.cc:
  merge WL#2486
sql/sql_show.cc:
  merge WL#2486

2005-08-12 19:27:54 +03: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

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

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

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

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

2005-02-01 14:37:51 +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_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_lowercase0.inc

Make lowercase_table3 get skipped on Windows, as intended. (Bug #11568)

2005-08-02 15:58:41 -07: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

Merge

2005-02-07 18:05:11 +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

ndb_default_cluster.inc

added check in ndb tests that require "default" cluster running

2005-01-26 14:38:13 +01: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

The BIT patch by ramil causes that the old data type BIT is no

2004-12-17 14:27:39 +01: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

Implementation of WL#2486 -

2005-08-12 17:57:19 +03: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

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

Bug#8191 - SELECT INTO OUTFILE insists on FROM clause

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

testdb_only.inc

WL#1420 convert NIST test for mysql

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

varchar.inc

A fix (bug #10176: problem with varchar keys).

2005-04-26 19:46:52 +05:00