unknown f6758b47fb Manual merge ...

include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_extra.c:
  Auto merged
myisam/mi_locking.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/key_cache.result:
  Auto merged
mysql-test/t/key_cache.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.h:
  Auto merged

2003-08-26 00:13:22 -07:00

..

alias.result

Proposed fix for #751

2003-07-03 20:57:51 +05:00

alter_table.result

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

analyse.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

ansi.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

auto_increment.result

After merge fixes

2003-08-19 00:08:08 +03:00

backup.result

After merge fixes

2003-03-17 15:05:04 +02:00

bdb_cache.result

Proper cleanup for BDB test

2002-12-09 19:20:05 +03:00

bdb-alter-table-1.result

…

bdb-alter-table-2.result

…

bdb-crash.result

Changed some tests to pass with new auto_increment handling,

2003-03-22 20:34:20 +02:00

bdb-deadlock.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

bdb.result

Fix test results affected by error message edit.

2003-07-20 07:00:00 -05:00

bench_count_distinct.result

…

big_test.require

…

bigint.result

bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0' => syntax error

2003-07-20 12:26:18 +02:00

binary.result

make the test more obvious

2003-03-06 15:29:55 +01:00

bool.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

bulk_replace.result

…

case.result

Some fixes in CASE.

2003-07-18 12:42:35 +05:00

cast.result

CAST(expr AS CHAR(10)) is now working

2003-08-21 14:15:25 +05:00

check.result

…

comments.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

compare.result

Merge with 4.0

2002-11-21 15:56:48 +02:00

connect.result

cleaned user used in tests 'connect' and 'rpl_temporary'

2003-06-13 11:17:31 +02:00

constraints.result

Added new ANSI functions LOCALTIME, LOCALTIMESTAMP and CURRENT_USER

2002-11-24 15:47:19 +02:00

count_distinct2.result

…

count_distinct3.result

fix for bug #958 and tests for it

2003-08-06 16:58:03 +04:00

count_distinct.result

count(distint) on an empty table crash fixed

2003-02-10 12:01:47 +01:00

create.result

After merge fixes

2003-08-19 00:08:08 +03:00

ctype_collate.result

Fixed that this sequence didn't produce an error as it should have:

2003-07-29 17:39:39 +05:00

ctype_cp1251.result

Cleaner implementation if INSERT ... SELECT with same tables

2003-07-03 11:55:36 +03:00

ctype_latin1_de.result

After merge fixes

2003-08-19 00:08:08 +03:00

ctype_many.result

func_gconcat.result, ctype_many.result:

2003-04-24 14:49:01 +03:00

ctype_mb.result

Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a

2003-08-11 18:18:34 +05:00

ctype_recoding.result

Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a

2003-08-11 18:18:34 +05:00

ctype_ujis.result

--with-charset was not up to date

2003-05-26 20:22:23 +05:00

delayed.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

delete.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

derived.result

fixed problem with reference on derived table fields (BUG#1031)

2003-08-12 15:04:49 +03:00

dirty_close.result

…

distinct.result

After merge fixes

2003-08-19 00:08:08 +03:00

drop.result

After merge fixes

2003-08-19 00:08:08 +03:00

empty_table.result

…

errors.result

Merge with 4.0.13

2003-06-04 19:21:51 +03:00

explain.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

flush.result

Cleaner implementation if INSERT ... SELECT with same tables

2003-07-03 11:55:36 +03:00

foreign_key.result

…

fulltext2.result

added disable_query_log to fulltext2.test

2003-08-01 18:49:30 +04:00

fulltext_cache.result

…

fulltext_distinct.result

…

fulltext_left_join.result

fulltext and left join bug fixed

2003-06-16 23:05:45 +02:00

fulltext_multi.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

fulltext_order_by.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

fulltext_update.result

…

fulltext_var.result

fixes for SHOW VARIABLES and --ft-stopword-list

2003-01-27 12:12:12 +01:00

fulltext.result

After merge fixes

2003-08-19 00:08:08 +03:00

func_compress.result

small compress/uncompress modification after monty's review

2003-04-22 18:41:47 -04:00

func_concat.result

…

func_crypt.result

Fix problem in MIN/MAX optimisation (from last patch)

2003-02-07 17:57:07 +02:00

func_date_add.result

Fixes for binary protocol (complement to last push)

2002-12-14 17:43:01 +02:00

func_encrypt.result

…

func_equal.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

func_gconcat.result

After merge fixes

2003-08-19 00:08:08 +03:00

func_group.result

Merge rurik.mysql.com:/home/igor/mysql-4.1

2003-08-02 03:27:13 -07:00

func_if.result

…

func_in.result

IN now aggregates all argument types for comparison

2003-07-18 14:03:54 +05:00

func_isnull.result

…

func_like.result

LIKE didn't work with non-default charset

2003-08-12 16:42:52 +05:00

func_math.result

do not force CONNECTION_ID(), FOUND_ROWS(), PI(), CURRENT_USER(),

2003-01-28 00:55:41 +01:00

func_misc.result

Testcase for #628

2003-07-03 16:48:47 +05:00

func_op.result

…

func_regexp.result

…

func_sapdb.result

SAPDB date/time finctions

2003-07-08 15:06:05 +05:00

func_set.result

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

func_str.result

After merge fixes

2003-08-19 00:08:08 +03:00

func_system.result

Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a

2003-08-11 18:18:34 +05:00

func_test.result

After merge fixes

2003-08-19 00:08:08 +03:00

func_time.result

merge

2003-08-19 00:10:21 +03:00

func_timestamp.result

…

gcc296.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

gis-rtree.result

Should use GeometryFromWKB().

2003-03-18 17:01:38 +04:00

gis.result

"Collation" has been moved to SHOW FULL FIELDS

2003-06-02 17:19:06 +05:00

grant2.result

test results fixed

2003-07-28 16:58:51 +02:00

grant_cache.result

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

grant.result

After merge fixes

2003-08-19 00:08:08 +03:00

group_by.result

After merge fixes

2003-08-19 00:08:08 +03:00

handler.result

After merge fixes

2003-08-19 00:08:08 +03:00

have_bdb.require

…

have_compress.require

added compress/uncompress function

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

have_crypt.require

Fixes for Netware

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

have_innodb.require

…

have_isam.require

…

have_mest_timezone.require

Fixed problem with mysql prompt when server disconnect. (Bug 356)

2003-05-27 16:40:14 +03:00

have_openssl_1.require

Openssl test

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

have_openssl_2.require

Fix openssl_2 test so it passes or fails. (It was being reported

2003-07-16 23:47:48 -05:00

have_openssl.require

…

have_query_cache.require

…

have_raid.require

…

have_symlink.require

…

have_ucs2.require

"Collation" has been moved to SHOW FULL FIELDS

2003-06-02 17:19:06 +05:00

have_ujis.require

"Collation" has been moved to SHOW FULL FIELDS

2003-06-02 17:19:06 +05:00

having.result

Merge with 4.0.13

2003-05-19 16:35:49 +03:00

heap_auto_increment.result

test case for auto_increment for HEAP

2002-10-08 15:54:51 +05:00

heap_btree.result

After merge fixes

2003-08-19 00:08:08 +03:00

heap_hash.result

After merge fixes

2003-08-19 00:08:08 +03:00

heap.result

After merge fixes

2003-08-19 00:08:08 +03:00

help.result

new version of help

2003-05-29 17:47:31 -04:00

innodb_cache.result

new result of Query Cache with Innodb

2003-04-17 16:24:56 +03:00

innodb_handler.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

innodb-deadlock.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

innodb.result

After merge fixes

2003-08-19 00:08:08 +03:00

ins000001.result

…

insert_select.result

After merge fixes

2003-08-19 00:08:08 +03:00

insert_update.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

insert.result

After merge fixes

2003-08-19 00:08:08 +03:00

isam.result

Fix test results affected by error message edit.

2003-07-20 07:00:00 -05:00

join_crash.result

…

join_outer.result

After merge fixes

2003-08-19 00:08:08 +03:00

join.result

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

key_cache.result

After merge fixes

2003-08-19 00:08:08 +03:00

key_diff.result

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

key_primary.result

Fixes for binary protocol (complement to last push)

2002-12-14 17:43:01 +02:00

key.result

After merge fixes

2003-08-19 00:08:08 +03:00

keywords.result

Fixes for binary protocol (complement to last push)

2002-12-14 17:43:01 +02:00

kill.result

…

limit.result

…

loaddata.result

After merge fixes

2003-08-19 00:08:08 +03:00

lock_multi.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

lock_tables_lost_commit.result

Test for bug 578. And a comment in slave.cc.

2003-06-05 17:02:00 +02:00

lock.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

lowercase_table.result

After merge fix

2003-06-04 23:17:01 +03:00

merge.result

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

multi_update.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

myisam.result

After merge fixes

2003-08-19 00:08:08 +03:00

not_embedded.require

…

null_key.result

After merge fixes

2003-08-19 00:08:08 +03:00

null.result

After merge fixes

2003-08-19 00:08:08 +03:00

odbc.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

olap.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

openssl_1.result

Update openssl_1 test.

2003-07-15 14:37:22 -05:00

openssl_2.result

Fix openssl_2 test so it passes or fails. (It was being reported

2003-07-16 23:47:48 -05:00

order_by.result

After merge fixes

2003-08-19 00:08:08 +03:00

order_fill_sortbuf.result

…

overflow.result

…

packet.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

preload.result

preload.result, preload.test:

2003-06-19 02:34:33 -07:00

query_cache.result

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

raid.result

Fixed a bug in DROP DATABASE when database had a RAID type table.

2003-05-13 22:28:34 +03:00

range.result

Manual merge

2003-08-26 00:13:22 -07:00

rename.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

repair_part1.result

Fix test results affected by error message edit.

2003-07-20 07:00:00 -05:00

repair_part2.result

Error message consistency edits + updates to affected test results.

2003-07-16 14:37:00 -05:00

replace.result

test results updated

2003-06-10 15:19:59 +02:00

rollback.result

…

row.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

rpl000001.a.result

…

rpl000001.b.result

…

rpl000001.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

rpl000002.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

rpl000004.a.result

…

rpl000004.b.result

…

rpl000004.result

Merge with 4.0.11 tree to get latest bug fixes

2003-02-17 05:43:37 +02:00

rpl000005.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

rpl000006.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

rpl000008.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

rpl000009.result

- Updated error message tests in several results of the test suite after

2003-07-10 10:02:57 +02:00

rpl000010.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

rpl000011.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

rpl000012.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

rpl000013.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

rpl000015.result

On Feb 4th, 2003, Monty said he would push my patch to print replicate-do-table

2003-07-23 15:46:46 +02:00

rpl000017.result

altered syntax from SLAVE START|STOP to START|STOP SLAVE

2002-10-24 17:46:14 -06:00

rpl000018.result

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

rpl_alter.result

Fixed problem when comparing a key for a multi-byte-character set. (bug 152)

2003-04-27 22:12:08 +03:00

rpl_do_grant.result

After merge fixes

2003-08-19 00:08:08 +03:00

rpl_empty_master_crash.result

On Feb 4th, 2003, Monty said he would push my patch to print replicate-do-table

2003-07-23 15:46:46 +02:00

rpl_error_ignored_table.result

After merge fixes

2003-08-19 00:08:08 +03:00

rpl_failsafe.result

Merge with 4.0.8

2003-01-03 00:04:33 +02:00

rpl_flush_log_loop.result

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

rpl_flush_tables.result

After merge fixes

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

rpl_get_lock.result

altered syntax from SLAVE START|STOP to START|STOP SLAVE

2002-10-24 17:46:14 -06:00

rpl_ignore_grant.result

After merge fixes

2003-08-19 00:08:08 +03:00

rpl_insert_id.result

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

rpl_loaddata.result

After merge fixes

2003-08-19 00:08:08 +03:00

rpl_loaddatalocal.result

After merge fixes

2003-03-17 15:05:04 +02:00

rpl_log_pos.result

After merge fixes

2003-08-19 00:08:08 +03:00

rpl_log.result

After merge fixes

2003-08-19 00:08:08 +03:00

rpl_master_pos_wait.result

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

rpl_max_relay_size.result

After merge fixes

2003-08-19 00:08:08 +03:00

rpl_misc_functions.result

Proper replication of CONNECTION_ID() and 4.1 PASSWORD() (bugs 177 and 344),

2003-05-13 22:50:28 +02:00

rpl_mystery22.result

altered syntax from SLAVE START|STOP to START|STOP SLAVE

2002-10-24 17:46:14 -06:00

rpl_redirect.result

On Feb 4th, 2003, Monty said he would push my patch to print replicate-do-table

2003-07-23 15:46:46 +02:00

rpl_relayrotate.result

Cleaning DROP TABLE which is important if the tests are run in a certain order.

2003-05-22 22:29:44 +02:00

rpl_relayspace.result

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

rpl_replicate_do.result

After merge fixes

2003-08-19 00:08:08 +03:00

rpl_reset_slave.result

After merge fixes

2003-08-19 00:08:08 +03:00

rpl_rotate_logs.result

After merge fixes

2003-08-19 00:08:08 +03:00

rpl_skip_error.result

Changed mysql-test to print warnings for not existing table to DROP TABLE

2003-01-06 01:48:59 +02:00

rpl_sporadic_master.result

altered syntax from SLAVE START|STOP to START|STOP SLAVE

2002-10-24 17:46:14 -06:00

rpl_temporary.result

We now require SUPER privilege for SET PSEUDO_THREAD_ID.

2003-06-11 17:07:33 +02:00

rpl_user_variables.result

After merge fixes

2003-08-19 00:08:08 +03:00

sel000033.result

…

sel000100.result

Testcase for #674 added

2003-06-25 17:15:33 +05:00

select_found.result

Merge with 4.0.11

2003-02-04 21:52:14 +02:00

select_safe.result

After merge fixes

2003-08-19 00:08:08 +03:00

select.result

After merge fixes

2003-08-19 00:08:08 +03:00

show_check.result

merge with public tree

2003-06-05 00:12:45 +03:00

slave-running.result

…

slave-stopped.result

…

sql_mode.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

status.result

…

subselect2.result

test of big subquery

2003-07-08 11:03:30 +03:00

subselect.result

merge

2003-08-19 20:14:35 +03:00

symlink.result

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

tablelock.result

…

temp_table.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

timezone.result

Fixed problem with mysql prompt when server disconnect. (Bug 356)

2003-05-27 16:40:14 +03:00

truncate.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

type_blob.result

After merge fixes

2003-08-19 00:08:08 +03:00

type_date.result

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

type_datetime.result

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

type_decimal.result

After merge fixes

2003-08-19 00:08:08 +03:00

type_enum.result

Updates for multi-byte character sets

2003-01-14 14:28:36 +02:00

type_float.result

After merge fixes

2003-08-19 00:08:08 +03:00

type_ranges.result

After merge fixes

2003-08-19 00:08:08 +03:00

type_set.result

A fix for a bug with long definition of SET or ENUM.

2003-08-19 16:35:17 +03:00

type_time.result

After merge fixes

2003-08-19 00:08:08 +03:00

type_timestamp.result

After merge fixes

2003-03-17 15:05:04 +02:00

type_uint.result

After merge fixes

2003-08-19 00:08:08 +03:00

type_year.result

…

union.result

After merge fixes

2003-08-19 00:08:08 +03:00

update.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

user_var.result

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

varbinary.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

variables.result

A new separate error message: Unknown collation 'blablabla'

2003-07-29 17:12:14 +05:00

warnings.result

After merge fixes

2003-08-19 00:08:08 +03:00