unknown ad5e39bf12 merge with public tree ...

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_version.h.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/ctype_collate.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysys/default.c:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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

..

alias.result

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

alter_table.result

merge with public tree

2003-06-05 00:12:45 +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

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +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

Some trivial optimzations

2002-09-03 15:44:25 +03:00

bdb-alter-table-2.result

Some trivial optimzations

2002-09-03 15:44:25 +03:00

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

Added SQLSTATE to client/server protocol

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

bench_count_distinct.result

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

big_test.require

Fixed bug when sorting big files (introduced with multi-table-delete)

2001-06-25 11:35:22 +03:00

bigint.result

Merge with 4.0

2003-02-27 03:49:26 +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

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

case.result

Merge with 4.0.8

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

cast.result

mysqlshow and mysqldump now send their vharacter set to server

2003-05-30 23:09:35 +05:00

check.result

mi_check flags cleanup

2002-03-13 17:20:17 +00:00

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

new version of help

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

constraints.result

Added new ANSI functions LOCALTIME, LOCALTIMESTAMP and CURRENT_USER

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

count_distinct2.result

Cleanup after last merge

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

count_distinct.result

count(distint) on an empty table crash fixed

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

create.result

merge with public tree

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

ctype_collate.result

merge with public tree

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

ctype_latin1_de.result

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

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

ctype_many.result

func_gconcat.result, ctype_many.result:

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

ctype_recoding.result

"Collation" has been moved to SHOW FULL FIELDS

2003-06-02 17:19:06 +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

Added SQLSTATE to client/server protocol

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

dirty_close.result

Added --user=userid to mysqld

2002-02-13 22:37:19 +02:00

distinct.result

Added SQLSTATE to client/server protocol

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

drop.result

Added SQLSTATE to client/server protocol

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

empty_table.result

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

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

Added SQLSTATE to client/server protocol

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

foreign_key.result

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

fulltext2.result

Two-level index structure for FULLTEXT indexes

2003-01-21 19:24:34 +01:00

fulltext_cache.result

ft boolean search by table scan; queue_fix()

2001-11-06 16:17:31 +01:00

fulltext_distinct.result

tests added

2001-11-20 17:58:00 +01:00

fulltext_left_join.result

fixed tests to be independed from environment

2002-08-30 21:32:59 +03: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

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

fulltext_var.result

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

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

fulltext.result

Added SQLSTATE to client/server protocol

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

func_compress.result

small compress/uncompress modification after monty's review

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

func_concat.result

Fixes for gcc 3.1

2002-05-21 20:35:58 +03:00

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

Added FLUSH DES_KEY_FILE.

2001-12-13 15:53:18 +02:00

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

Added SQLSTATE to client/server protocol

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

func_group.result

After merge fixes

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

func_if.result

Fixes after last merge

2002-08-12 07:02:08 +03:00

func_in.result

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

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

func_isnull.result

Fixed some compilation problems in last changeset

2002-05-16 23:35:09 +03:00

func_like.result

After merge fixes

2003-03-17 15:05:04 +02: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

Safety fix to enable RAID in max binaries

2003-05-13 10:54:07 +03:00

func_op.result

New error messages

2002-01-29 18:32:16 +02:00

func_regexp.result

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

func_set.result

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

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

func_str.result

Collation & coercibility tests for LTRIM, RTRIM and TRIM

2003-06-03 17:13:19 +05:00

func_system.result

Added SQLSTATE to client/server protocol

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

func_test.result

Added support for ULONG division with DIV

2003-03-19 21:23:13 +02:00

func_time.result

add option default-week-format and variable default_week_format

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

func_timestamp.result

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

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

grant_cache.result

Added SQLSTATE to client/server protocol

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

grant.result

Fix for a bug in SHOW GRANTS when :

2003-01-11 18:02:10 +02:00

group_by.result

Added SQLSTATE to client/server protocol

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

handler.result

Added SQLSTATE to client/server protocol

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

have_bdb.require

Extended mysqltest with --commands and 'require'

2000-12-27 03:31:06 +02:00

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

Changed Innobase to Innodb

2001-04-13 12:25:12 +03:00

have_isam.require

Extended mysqltest with --commands and 'require'

2000-12-27 03:31:06 +02:00

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

Yet another SSL fixes

2001-09-01 06:57:08 +08:00

have_openssl.require

changes to make things work in the max version

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

have_query_cache.require

added building without query cache

2002-03-22 22:55:08 +02:00

have_raid.require

Added support for hex strings to mysqlimport

2000-12-28 03:56:38 +02:00

have_symlink.require

Symlinking of tables should not work.

2001-06-05 03:38:10 +03:00

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

Added SQLSTATE to client/server protocol

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

heap_hash.result

Added SQLSTATE to client/server protocol

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

heap.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +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

merge with public tree

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

ins000001.result

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

insert_select.result

After merge fix

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

insert_update.result

Added SQLSTATE to client/server protocol

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

insert.result

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

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

isam.result

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

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

join_crash.result

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

join_outer.result

Added SQLSTATE to client/server protocol

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

join.result

Added SQLSTATE to client/server protocol

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

key_diff.result

Transactions in AUTOCOMMIT=0 mode didn't rotate binary log

2002-12-14 12:45:31 +02:00

key_primary.result

Fixes for binary protocol (complement to last push)

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

key.result

Added SQLSTATE to client/server protocol

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

keywords.result

Fixes for binary protocol (complement to last push)

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

kill.result

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

limit.result

Fix some bugs introduced with the new my_getopt

2002-02-08 03:21:34 +02:00

loaddata.result

After merge fix

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

lock_multi.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03: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

Added SQLSTATE to client/server protocol

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

multi_update.result

Added SQLSTATE to client/server protocol

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

myisam.result

Added SQLSTATE to client/server protocol

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

not_embedded.require

Updated manual about embedded version.

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

null_key.result

merge

2003-05-22 02:57:27 +03:00

null.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +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

Openssl test

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

openssl_2.result

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

order_by.result

Added SQLSTATE to client/server protocol

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

order_fill_sortbuf.result

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

overflow.result

fixed error messages

2001-10-08 20:18:37 -06:00

packet.result

Added SQLSTATE to client/server protocol

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

query_cache.result

After merge fix

2003-06-04 23:17:01 +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

Fixes for binary protocol (complement to last push)

2002-12-14 17:43:01 +02: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_part2.result

Fix for MacOSX and symlinks

2003-05-14 01:27:26 +03:00

repair.result

After merge fixes

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

replace.result

SCRUM

2003-01-22 20:08:12 +04:00

rollback.result

Fixes and code cleanups after merge with 4.0.3

2002-10-02 13:33:08 +03:00

row.result

Added SQLSTATE to client/server protocol

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

rpl000001.a.result

Extended mysqltest with --commands and 'require'

2000-12-27 03:31:06 +02:00

rpl000001.b.result

Extended mysqltest with --commands and 'require'

2000-12-27 03:31:06 +02:00

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

Cleanup of tests to make them less dependent of eachother

2001-01-03 02:15:48 +02:00

rpl000004.b.result

Extended mysqltest with --commands and 'require'

2000-12-27 03:31:06 +02:00

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

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03: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

Changed binlog name padding from binlog.001 to binlog.000001

2002-10-29 15:11:13 -07:00

rpl000017.result

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

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

rpl000018.result

Changed binlog name padding from binlog.001 to binlog.000001

2002-10-29 15:11:13 -07: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_empty_master_crash.result

Added SQLSTATE to client/server protocol

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

rpl_failsafe.result

Merge with 4.0.8

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

rpl_flush_log_loop.result

Changed binlog name padding from binlog.001 to binlog.000001

2002-10-29 15:11:13 -07: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_insert_id.result

Merge with 4.0.13

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

rpl_loaddata.result

fixed 'STARTING BY' in replication

2003-05-21 14:54:02 -04:00

rpl_loaddatalocal.result

After merge fixes

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

rpl_log_pos.result

Added support for DROP TEMPORARY TABLE

2003-01-04 15:37:20 +02:00

rpl_log.result

After merge fix

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

rpl_master_pos_wait.result

After merge fixes & remove compiler warnings

2003-02-07 15:47:24 +02: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

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

2003-01-06 01:48:59 +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

After merge fixes

2003-03-20 21:35:03 +02:00

rpl_replicate_do.result

Added SQLSTATE to client/server protocol

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

rpl_rotate_logs.result

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +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

Test's result update because std_data/words.dat has been lengthened by 500 bytes.

2003-02-21 23:38:56 +01:00

rpl_user_variables.result

Test's result update because std_data/words.dat has been lengthened by 500 bytes.

2003-02-21 23:38:56 +01:00

sel000033.result

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

sel000100.result

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

select_found.result

Merge with 4.0.11

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

select_safe.result

Added SQLSTATE to client/server protocol

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

select.result

Added SQLSTATE to client/server protocol

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

show_check.result

merge with public tree

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

slave-running.result

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

slave-stopped.result

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

sql_mode.result

Added SQLSTATE to client/server protocol

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

status.result

client/mysqlmanagerc.c

2001-09-27 23:05:54 -06:00

subselect.result

merge with public tree

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

symlink.result

symlink.result:

2003-05-24 23:30:55 +05:00

tablelock.result

Cleanup after last merge

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

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

merge with public tree

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

type_date.result

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

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

type_datetime.result

Merge with 4.0

2003-03-16 19:17:54 +02:00

type_decimal.result

Added SQLSTATE to client/server protocol

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

type_enum.result

Updates for multi-byte character sets

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

type_float.result

Added SQLSTATE to client/server protocol

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

type_ranges.result

Added SQLSTATE to client/server protocol

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

type_set.result

Updates for multi-byte character sets

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

type_time.result

Updated warning test

2003-04-30 00:07:37 -07:00

type_timestamp.result

After merge fixes

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

type_uint.result

Updated warning test

2003-04-30 00:07:37 -07:00

type_year.result

fixed tests to be independed from environment

2002-08-30 21:32:59 +03:00

union.result

Added SQLSTATE to client/server protocol

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

update.result

Added SQLSTATE to client/server protocol

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

user_var.result

Added SQLSTATE to client/server protocol

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

varbinary.result

Added SQLSTATE to client/server protocol

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

variables.result

Added SQLSTATE to client/server protocol

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

warnings.result

Fix merge conflict by changing warning codes to new one

2003-05-21 01:21:06 -07:00