mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36525 commits 2784 branches 343 tags 1.6 GiB
Commit graph

107 commits

Author SHA1 Message Date
unknown
5b6016c14e Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Auto merged
BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.cc:
  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_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/federated.result:
  Use local.
mysql-test/r/myisam.result:
  Manual merge.
mysql-test/t/federated.test:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
sql/Makefile.am:
  Manual merge.
sql/set_var.cc:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_update.cc:
  Manual merge.
storage/myisam/mi_create.c:
  Manual merge.
 2006-07-26 23:33:25 +04:00
unknown
7841fa4985 Fix test results to be vardir-independent. 
mysql-test/r/myisam.result:
  Fix test results.
mysql-test/t/myisam.test:
  In 5.0 show create table also outputs data directory.
  For the test for Bug#8706 it's MYSQLTEST_VARDIR, and there is no way
  to replace it with anything else in test output.
 2006-07-10 16:22:42 +04:00
unknown
23444c90c6 A post-merge fix (Bug#8706 "temporary table with data directory option 
fails"


mysql-test/t/myisam.test:
  Fix myisam.test to work with non-default mysqltest var directory.
 2006-07-10 14:53:49 +04:00
unknown
60b7f9d645 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41


BitKeeper/etc/ignore:
  auto-union
libmysqld/Makefile.am:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/myisam.result:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
sql/set_var.cc:
  Manual merge.
sql/set_var.h:
  Manual merge.
sql/sql_cache.cc:
  Manual merge.
sql/sql_class.cc:
  Manual merge.
 2006-07-08 02:30:07 +04:00
unknown
854d7c4d4f Bug#8706 
"temporary table with data directory option fails"
  myisam should not use user-specified table name when creating
  temporary tables and use generated connection specific real name.
  Test included.


myisam/mi_create.c:
  Bug#8706
    When creating a temporary table with directory override, ensure that
    the real filename is using the hidden temporary name otherwise
    multiple clients cannot have same named temporary tables without
    conflict.
mysql-test/r/myisam.result:
  Bug#8706
    Test for bug
mysql-test/t/myisam.test:
  Bug#8706
    Test for bug
 2006-07-05 17:18:59 -07:00
unknown
c2575322c6 Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/valgrind.supp:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
include/Makefile.am:
  manual merge
mysql-test/r/func_time.result:
  manual merge
mysql-test/r/select.result:
  manual merge
 2006-06-25 09:59:34 -04:00
unknown
5b9d44fd86 Merge may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-5.0


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/opt_sum.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
 2006-06-21 19:41:09 +05:00
unknown
bf76f070dd Merge april:devel/BitKeeper/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1


sql/opt_sum.cc:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
mysql-test/t/myisam.test:
  SCCS merged
 2006-06-21 17:51:16 +05:00
unknown
5c0cdea623 BUG#20357 - Got error 124 from storage engine using MIN and MAX 
functions in queries

Using MAX()/MIN() on table with disabled indexes (by ALTER TABLE)
results in error 124 (wrong index) from storage engine.

The problem was that optimizer use disabled index to optimize
MAX()/MIN(). Normally it must skip disabled index and perform
table scan.

This patch skips disabled indexes for min/max optimization.


mysql-test/r/myisam.result:
  Test case for BUG#20357.
mysql-test/t/myisam.test:
  Test case for BUG#20357.
sql/opt_sum.cc:
  Skip disabled/ignored indexes for min/max optimization.
 2006-06-21 17:30:59 +05:00
unknown
89fc7fdb05 Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/t/myisam.test:
  Manual merge.
 2006-06-20 16:45:51 +05:00
unknown
e2097100f8 Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0


mysql-test/r/myisam.result:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
sql/sql_update.cc:
  Manual merge.
 2006-06-19 16:06:29 +05:00
unknown
46cdd39ea6 BUG#18036 - update of table joined to self reports table as crashed 
Certain updates of table joined to self results in unexpected
behavior.

The problem was that record cache was mistakenly enabled for
self-joined table updates. Normally record cache must be disabled
for such updates.

Fixed wrong condition in code that determines whether to use
record cache for self-joined table updates.

Only MyISAM tables were affected.


mysql-test/r/myisam.result:
  Test case for BUG#18036.
mysql-test/t/myisam.test:
  Test case for BUG#18036.
sql/sql_update.cc:
  Fixed wrong condition in code that determines whether to use
  record cache for self-joined table updates.
 2006-06-19 14:05:14 +05:00
unknown
335cf16a52 don't introduce a deprecated syntax 2006-05-08 16:06:16 -04:00
unknown
d50ae16569 Added support for key_block_size for key and table level (WL#602) 
Added support for key_block_size to MyISAM.
Simplify interface to 'new Key' to make it easier to add new key options.
mysqld option --new is used to define where key options are printed.
(In 5.3 we should move all key options to after key part definition to avoid problem with reserved names)
Fixed some compiler warnings and a memory leak in ssl


include/my_base.h:
  Added flag to check if block size for key was secified
include/my_sys.h:
  Added new support function to round up to a power of two
include/myisam.h:
  Rename block_size -> block_size_index to avoid confusion with 'block_size'
include/violite.h:
  Added function to free memory after new_VioSSLAcceptorFd
  (Will rename all vio_ssl functions in a future changeset)
mysql-test/mysql-test-run.pl:
  Don't print port number info when we use --extern
mysql-test/r/myisam.result:
  Added test for key_block_size
mysql-test/t/myisam.test:
  Added test for key_block_size
mysys/mf_keycache.c:
  Simplify code
mysys/my_bit.c:
  Added new support function to round up to a power of two
sql/ha_myisam.cc:
  Tell MyISAM to use the specified key_block_size
  MyISAM also updates the global key_block_size from the used values.
sql/handler.cc:
  Added 'default_key_create_info' to be used as 'dummy' argument to 'new Key'
sql/handler.h:
  Added KEY_CREATE_INFO, to be used as for general options for KEY's
sql/item_func.h:
  Removed compiler warning
sql/lex.h:
  Added new symbol
sql/mysqld.cc:
  Fixed memory leak in ssl (new_VioSSLAcceptorFd)
sql/sql_class.h:
  Change 'new Key' to use KEY_CREATE_INFO instead of 'algoritm', parser, key_page_size.
  This makes it easier to add new key options in the future.
sql/sql_lex.h:
  Added key create options
sql/sql_parse.cc:
  Use new interface to 'new Key'
sql/sql_show.cc:
  Added support for key_block_size
  If --new is used, key options are printed after the key part definition.
sql/sql_table.cc:
  Use new interface to 'new Key'
  Add support for key_block_size
sql/sql_yacc.yy:
  Add support for key_block_size
  Allow key options before and after key_parts (In future they should be always after the key_part defintion)
  Use new interface to 'new Key'
sql/structs.h:
  Added block_size to keys
sql/table.cc:
  Remmeber and read key_block_size for table and key level
sql/table.h:
  Added default key_block_size for table
sql/unireg.cc:
  Remember key_block_size for key
storage/myisam/ft_eval.c:
  Set block_length to 0 to get default key page size
storage/myisam/ft_test1.c:
  Set block_length to 0 to get default key page size
storage/myisam/mi_check.c:
  block_size -> block_size_index
storage/myisam/mi_create.c:
  Added support for block size per key.
  Block size is rounded up to next power of two and enforced between MIN and MAX KEY_BLOCK_LENGTH.
  Align start of key block to start at an even offset of max_key_block_length to ensure key cache works good if all key pages are of same size.
storage/myisam/mi_open.c:
  block_size -> block_size_index
storage/myisam/mi_page.c:
  block_size -> block_size_index
storage/myisam/mi_test1.c:
  Set block_length to 0 to get default key page size
storage/myisam/mi_test2.c:
  Set block_length to 0 to get default key page size
storage/myisam/mi_test3.c:
  Set block_length to 0 to get default key page size
storage/myisam/myisamdef.h:
  block_size -> block_size_index to avoid confusion with 'block_size' in MySQL
  Added block_size as argument to MI_BLOCK_SIZE
  Added missing prototypes to get rid of compiler warnings
storage/myisam/myisampack.c:
  Removed compiler warning
  block_size -> block_size_index
vio/viosslfactories.c:
  Fixed memory leak in ssl (new_VioSSLAcceptorFd)
mysql-test/r/myisam-system.result:
  New BitKeeper file ``mysql-test/r/myisam-system.result''
mysql-test/t/myisam-system.test:
  New BitKeeper file ``mysql-test/t/myisam-system.test''
 2006-05-03 15:59:17 +03:00
unknown
cefb1dc274 Merge mysql.com:/home/mydev/mysql-4.1-bug14980 
into  mysql.com:/home/mydev/mysql-5.0-bug14980


include/my_base.h:
  Auto merged
myisam/mi_delete.c:
  Auto merged
myisam/mi_key.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
myisam/mi_unique.c:
  Auto merged
myisam/mi_update.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
mysql-test/t/myisam.test:
  SCCS merged
 2006-03-10 15:06:04 +01:00
unknown
fbe17c2a36 Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX 
For "count(*) while index_column = value" an index read
is done. It consists of an index scan and retrieval of
each key.

For efficiency reasons the index scan stores the key in
the special buffer 'lastkey2' once only. At the first 
iteration it notes this fact with the flag 
HA_STATE_RNEXT_SAME in 'info->update'.

For efficiency reasons, the key retrieval for blobs
does not allocate a new buffer, but uses 'lastkey2'...

Now I clear the HA_STATE_RNEXT_SAME flag whenever the 
buffer has been polluted. In this case, the index scan
copies the key value again (and sets the flag again).


include/my_base.h:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Changed the comment for HA_STATE_RNEXT_SAME as a warning
  for future uses.
myisam/mi_delete.c:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Removing the flag HA_STATE_RNEXT_SAME from info->update
  if info->lastkey2 was reused for another purpose than
  index scanning.
myisam/mi_key.c:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Removing the flag HA_STATE_RNEXT_SAME from info->update
  if info->lastkey2 was reused for another purpose than
  index scanning.
myisam/mi_rnext_same.c:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Removed trailing space and fixed a comment.
myisam/mi_unique.c:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Removing the flag HA_STATE_RNEXT_SAME from info->update
  if info->lastkey2 was reused for another purpose than
  index scanning.
myisam/mi_update.c:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Removing the flag HA_STATE_RNEXT_SAME from info->update
  if info->lastkey2 was reused for another purpose than
  index scanning.
myisam/mi_write.c:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Removing the flag HA_STATE_RNEXT_SAME from info->update
  if info->lastkey2 was reused for another purpose than
  index scanning.
mysql-test/r/myisam.result:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Added test result.
mysql-test/t/myisam.test:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Added test.
 2006-03-10 15:03:04 +01:00
unknown
d40f7056ae Make it possible to run mysql-test-run.pl with default test suite in different vardir. 
mysql-test/include/have_outfile.inc:
  Use MYSQLTEST_VARDIR
mysql-test/include/test_outfile.inc:
  Use MYSQLTEST_VARDIR
mysql-test/mysql-test-run.pl:
  Create variable $MYSQLTEST_VARDIR that points to  the vardir
  Don't create a symlink from var/ to the physical vardir if it's somewhere else
  Setup a symlink(or copy dir on windows) for std_data so it is available in the physical vardir
  Use "../tmp" as slave-load-tmpdir, since the server is started in var/master-data and slave in var/slave-data they will both find the dumps in "../tmp"
mysql-test/mysql-test-run.sh:
  Export MYSQLTEST_VARDIR, always pointing at mysql-test/var
mysql-test/r/backup.result:
  Use MYSQLTEST_VARDIR
mysql-test/r/blackhole.result:
  Use "../std_data_ln" to find std_data files
mysql-test/r/loaddata.result:
  Use "../std_data_ln" to find std_data files
mysql-test/r/mysqlbinlog.result:
  Use "../std_data_ln" to find std_data files
mysql-test/r/mysqltest.result:
  Use MYSQLTEST_VARDIR
mysql-test/r/outfile.result:
  Use MYSQLTEST_VARDIR
mysql-test/r/query_cache.result:
  Add missing drop function
mysql-test/r/rpl000001.result:
  Use "../std_data_ln" to find std_data files
mysql-test/r/rpl000004.result:
  Use "../std_data_ln" to find std_data files
mysql-test/r/rpl_innodb.result:
  Use "../std_data_ln" to find std_data files
mysql-test/r/rpl_loaddata.result:
  Use "../std_data_ln" to find std_data files
mysql-test/r/rpl_loaddata_rule_m.result:
  Use "../std_data_ln" to find std_data files
mysql-test/r/rpl_loaddata_rule_s.result:
  Use "../std_data_ln" to find std_data files
mysql-test/r/rpl_loaddatalocal.result:
  Use MYSQLTEST_VARDIR
mysql-test/r/rpl_log.result:
  Use "../std_data_ln" to find std_data files
mysql-test/r/rpl_misc_functions.result:
  Use MYSQLTEST_VARDIR
mysql-test/r/rpl_replicate_do.result:
  Use "../std_data_ln" to find std_data files
mysql-test/r/rpl_rewrite_db.result:
  Use "../std_data_ln" to find std_data files
mysql-test/r/rpl_timezone.result:
  Use "../std_data_ln" to find std_data files
mysql-test/r/symlink.result:
  Use MYSQLTEST_VARDIR
mysql-test/r/trigger.result:
  Use "../std_data_ln" to find std_data files
mysql-test/r/view.result:
  Use "../std_data_ln" to find std_data files
mysql-test/r/warnings.result:
  Use "../std_data_ln" to find std_data files
mysql-test/t/backup-master.sh:
  Use MYSQLTEST_VARDIR
mysql-test/t/backup.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/blackhole.test:
  Use "../std_data_ln" to find std_data files
mysql-test/t/ctype_ucs_binlog.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/im_daemon_life_cycle-im.opt:
  Use MYSQLTEST_VARDIR
mysql-test/t/im_options_set.imtest:
  Use MYSQLTEST_VARDIR
mysql-test/t/im_options_unset.imtest:
  Use MYSQLTEST_VARDIR
mysql-test/t/loaddata.test:
  Use "../std_data_ln" to find std_data files
mysql-test/t/myisam.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/mysqlbinlog.test:
  Use "../std_data_ln" to find std_data files
mysql-test/t/mysqlbinlog2.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/mysqldump.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/mysqltest.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/ndb_autodiscover.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/outfile.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/query_cache.test:
  Add missing drop function
mysql-test/t/repair.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/rpl000001.test:
  Use "../std_data_ln" to find std_data files
mysql-test/t/rpl000004.test:
  Use "../std_data_ln" to find std_data files
mysql-test/t/rpl000009.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/rpl000015-slave.sh:
  Use MYSQLTEST_VARDIR
mysql-test/t/rpl000017-slave.sh:
  Use MYSQLTEST_VARDIR
mysql-test/t/rpl_EE_error.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/rpl_charset.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/rpl_drop_db.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/rpl_flush_log_loop-master.opt:
  Use MYSQLTEST_VARDIR
mysql-test/t/rpl_flush_log_loop-master.sh:
  Use MYSQLTEST_VARDIR
mysql-test/t/rpl_flush_log_loop-slave.opt:
  Use MYSQLTEST_VARDIR
mysql-test/t/rpl_flush_log_loop-slave.sh:
  Use MYSQLTEST_VARDIR
mysql-test/t/rpl_innodb.test:
  Use "../std_data_ln" to find std_data files
mysql-test/t/rpl_loaddata.test:
  Use "../std_data_ln" to find std_data files
mysql-test/t/rpl_loaddata_rule_m.test:
  Use "../std_data_ln" to find std_data files
mysql-test/t/rpl_loaddata_rule_s.test:
  Use "../std_data_ln" to find std_data files
mysql-test/t/rpl_loaddatalocal.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/rpl_log.test:
  Use "../std_data_ln" to find std_data files
mysql-test/t/rpl_misc_functions-slave.sh:
  Use MYSQLTEST_VARDIR
mysql-test/t/rpl_misc_functions.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/rpl_replicate_do.test:
  Use "../std_data_ln" to find std_data files
mysql-test/t/rpl_rewrite_db.test:
  Use "../std_data_ln" to find std_data files
mysql-test/t/rpl_rotate_logs-slave.sh:
  Use MYSQLTEST_VARDIR
mysql-test/t/rpl_rotate_logs.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/rpl_timezone.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/show_check.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/sp-destruct.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/symlink.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/temp_table-master.opt:
  Use MYSQLTEST_VARDIR
mysql-test/t/trigger-compat.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/trigger-grant.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/trigger.test:
  Use "../std_data_ln" to find std_data files
mysql-test/t/type_varchar.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/user_var-binlog.test:
  Use MYSQLTEST_VARDIR
mysql-test/t/view.test:
  Use "../std_data_ln" to find std_data files
mysql-test/t/warnings.test:
  Use "../std_data_ln" to find std_data files
mysql-test/include/sourced.inc:
  New BitKeeper file ``mysql-test/include/sourced.inc''
mysql-test/include/sourced1.inc:
  New BitKeeper file ``mysql-test/include/sourced1.inc''
 2006-01-24 08:30:54 +01:00
unknown
6506fb3219 Merge mysql.com:/home/mydev/mysql-4.1-4100 
into  mysql.com:/home/mydev/mysql-5.0-5000


mysql-test/r/handler.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/mysql_priv.h:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
sql/sql_base.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
sql/sql_handler.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
sql/sql_table.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
 2005-11-16 10:23:42 +01:00
unknown
b0a5184d80 Merge mysql.com:/home/mydev/mysql-4.0-bug14616 
into  mysql.com:/home/mydev/mysql-4.1-4100


mysql-test/r/myisam.result:
  Bug#14616 - Freshly imported table returns error 124 when using LIMIT
  Manual merge.
mysql-test/t/myisam.test:
  Bug#14616 - Freshly imported table returns error 124 when using LIMIT
  Manual merge.
sql/sql_select.cc:
  Bug#14616 - Freshly imported table returns error 124 when using LIMIT
  Manual merge.
 2005-11-15 16:07:05 +01:00
unknown
eeb99f505d Merge, will need post-merge fixes. 
mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
 2005-11-08 11:22:51 +03:00
unknown
5412ee4f29 Bug#14616 - Freshly imported table returns error 124 when using LIMIT 
Initialized usable_keys from table->keys_in_use instead of ~0
in test_if_skip_sort_order(). It was possible that a disabled
index was used for sorting.


mysql-test/r/myisam.result:
  Bug#14616 - Freshly imported table returns error 124 when using LIMIT
  The test result.
mysql-test/t/myisam.test:
  Bug#14616 - Freshly imported table returns error 124 when using LIMIT
  The test case.
 2005-11-07 12:16:49 +01:00
unknown
81882f7127 Fix for BUG#13814: in mi_pack_key(), when processing NULL value for TINYBLOB key segment, 
do advance the source pointer over 2 bytes that specify value length.


myisam/mi_key.c:
  Fix for BUG#13814: in mi_pack_key(), when processing NULL value for TINYBLOB key segment,
  do advance the source pointer over 2 bytes that specify value length (for NULL value the 
  format is: null_marker 0x01, value length 0x00 0x00, data: 0x00 keyseg->length times).
  We need to advance over 2 bytes separately as keyseg->length doesn't include them.
mysql-test/r/myisam.result:
  Testcase for BUG#13814
mysql-test/t/myisam.test:
  Testcase for BUG#13814
 2005-10-28 23:31:32 +04:00
unknown
0ae18e4899 Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/structs.h:
  Auto merged
 2005-10-28 11:00:54 +02:00
unknown
7911c50718 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


heap/_check.c:
  Auto merged
heap/hp_create.c:
  Auto merged
include/config-netware.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_handler.h:
  Auto merged
include/myisam.h:
  Auto merged
innobase/include/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_delete.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/update.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/update.test:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/my_handler.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/structs.h:
  Auto merged
strings/conf_to_src.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
Makefile.am:
  Merged from 4.1
myisam/myisamchk.c:
  Merged from 4.1
mysql-test/mysql-test-run.pl:
  Merged from 4.1
mysql-test/r/insert_select.result:
  Merged from 4.1
mysql-test/r/myisam.result:
  Merged from 4.1
mysql-test/r/select.result:
  Merged from 4.1
mysql-test/t/insert_select.test:
  Merged from 4.1
mysql-test/t/myisam.test:
  Merged from 4.1
netware/mysql_test_run.c:
  Merged from 4.1
sql/item.cc:
  Merged from 4.1
sql/mysqld.cc:
  Merged from 4.1
sql/sql_update.cc:
  Merged from 4.1
tests/mysql_client_test.c:
  Merged from 4.1
 2005-10-27 23:43:20 +03:00
unknown
71fdef4d10 BUG#9622, stage 2, work together with fix for BUG#12232: 
added "nulls_ignored" index statistics collection method for MyISAM tables.
(notification trigger: this is about BUG#9622).


include/my_base.h:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method:
  Added SEARCH_RETURN_B_POS flag for ha_key_cmp()
include/my_handler.h:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method: added ha_find_null()
include/myisam.h:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
myisam/mi_check.c:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method, added 
   mi_collect_stats_*(), updated update_key_parts() to deal with all 3 methods.
myisam/myisamchk.c:
  BUG#9622: Added nulls_ignored index statistics collection method for MyISAM
myisam/myisamdef.h:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
myisam/sort.c:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
mysql-test/r/myisam.result:
  Testcase for BUG9622
mysql-test/t/myisam.test:
  Testcase for BUG9622
mysys/my_handler.c:
  BUG#9622: ha_key_cmp() now supports new SEARCH_RETURN_B_POS flag, added ha_find_null()
sql/ha_myisam.cc:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
sql/mysqld.cc:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
 2005-10-21 06:29:17 +04:00
unknown
efc190e7d9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/structs.h:
  Auto merged
mysql-test/r/mysqltest.result:
  SCCS merged
 2005-10-12 13:59:00 +02:00
unknown
2bb0501d65 Always test ssl and compress 
- Updated after review


client/mysqltest.c:
  Updated after review.
  Fix "connect" command to take SSL and/or COMPRESS as options instead of enable/disable_ssl and enable/disable_compress
  Commented do_connect, added test cases etc.
  Fix safe_get_param to make it possible to call it once for every argument without having any checks inbetween.
  Make a copy for query->first_argument  since safe_get_param will modify query string. Now connect works inside a while loop as well.
mysql-test/mysql-test-run.pl:
  Updated after review
mysql-test/r/connect.result:
  Enable test that was previolsy disabled because of "no error handling" in connect
mysql-test/r/mysqltest.result:
  Added tests for "connect"
mysql-test/t/compress.test:
  Updated after review, use the option argument to connect
mysql-test/t/connect.test:
  Enable test that was previolsy disabled because of "no error handling" in connect
  Now it's possible to use "--error" before connect, so let's use it.
mysql-test/t/information_schema.test:
  Connection user4 was already used
mysql-test/t/myisam.test:
  Disconnect con1 so the name can be reused
mysql-test/t/mysqltest.test:
  Added tests for "connect"
mysql-test/t/openssl_1.test:
  Updated after review, use the option argument to connect
mysql-test/t/sp-security.test:
  Disconnect user1 connection so the name can be reused
mysql-test/t/ssl.test:
  Updated after review, use the option argument to connect
mysql-test/t/ssl_compress.test:
  Updated after review, use the option argument to connect
sql/mysqld.cc:
  Updated after review, Compression variable is always available
sql/sql_show.cc:
  Updated after review, Compression variable is always available
sql/structs.h:
  Updated after review, Compression variable is always available
 2005-10-12 13:56:07 +02:00
unknown
aa7bc459f7 merged 
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/mysys/mysys_ia64.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_sys.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_multi_delete2.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/rpl_multi_delete2-slave.opt:
  Auto merged
mysql-test/t/rpl_multi_delete2.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
 2005-09-21 13:53:22 +02:00
unknown
a2a8216b20 BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index 
statistics (like 4.0 did) (patch #3, with review #1 & #2 feedback addressed)


include/myisam.h:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
myisam/mi_check.c:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
myisam/myisamchk.c:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
mysql-test/r/myisam.result:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
mysql-test/t/myisam.test:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/ha_myisam.cc:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/handler.h:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/mysqld.cc:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/set_var.cc:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/sql_class.h:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
 2005-09-21 02:18:29 +04:00
unknown
194a520d21 Merge mysql.com:/home/mydev/mysql-4.1-4100 
into  mysql.com:/home/mydev/mysql-5.0-5000


myisam/mi_search.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/innodb.result:
  Hand merged.
mysql-test/r/key.result:
  Hand merged.
mysql-test/r/myisam.result:
  Hand merged.
mysql-test/t/key.test:
  Hand merged.
mysql-test/t/myisam.test:
  Hand merged.
sql/sql_delete.cc:
  Hand merged.
sql/sql_parse.cc:
  Hand merged.
 2005-08-29 18:18:30 +02:00
unknown
27201ccb06 Bug#10056 - PACK_KEYS option take values greater than 1 while creating table 
Added a switch to reject illegal values for PACK_KEYS.


mysql-test/r/myisam.result:
  Bug#10056 - PACK_KEYS option take values greater than 1 while creating table
  The test result.
mysql-test/t/myisam.test:
  Bug#10056 - PACK_KEYS option take values greater than 1 while creating table
  The test case.
 2005-08-29 17:24:07 +02:00
unknown
ea36375027 Bug#12296 - CHECKSUM TABLE reports 0 for the table 
Skipping deleted records instead of breaking the loop
during checksum calculation.


mysql-test/r/myisam.result:
  Bug#12296 - CHECKSUM TABLE reports 0 for the table
  The test result.
mysql-test/t/myisam.test:
  Bug#12296 - CHECKSUM TABLE reports 0 for the table
  The test case.
 2005-08-29 17:08:41 +02:00
unknown
41212921bf Merge deer.(none):/home/hf/work/mysql-4.1.clean 
into deer.(none):/home/hf/work/mysql-5.0.clean


mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
 2005-08-04 16:36:14 +05:00
unknown
999b0638b2 Merge deer.(none):/home/hf/work/mysql-4.1.clean 
into deer.(none):/home/hf/work/mysql-4.1.11083


mysql-test/t/myisam.test:
  Auto merged
 2005-08-04 16:30:36 +05:00
unknown
36b6bf2ef3 Merge mysql.com:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
BitKeeper/deleted/.del-isam.test~834fb0ee8196c445:
  Auto merged
include/thr_lock.h:
  Auto merged
mysql-test/t/alias.test:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/bool.test:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/count_distinct2.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ctype_many.test:
  Auto merged
mysql-test/t/ctype_ucs_binlog.test:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/distinct.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/endspace.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/fulltext_order_by.test:
  Auto merged
mysql-test/t/func_compress.test:
  Auto merged
mysql-test/t/func_concat.test:
  Auto merged
mysql-test/t/func_date_add.test:
  Auto merged
mysql-test/t/func_equal.test:
  Auto merged
mysql-test/t/func_if.test:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_set.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/gis-rtree.test:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/heap_btree.test:
  Auto merged
mysql-test/t/heap_hash.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
mysql-test/t/insert_update.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/keywords.test:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/lock.test:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysql-test/t/lowercase_table3.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/mysqlbinlog2.test:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/t/ndb_charset.test:
  Auto merged
mysql-test/t/ndb_grant.later:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
mysql-test/t/ndb_types.test:
  Auto merged
mysql-test/t/ndb_update.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysql-test/t/olap.test:
  Auto merged
mysql-test/t/openssl_1.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/ps_4heap.test:
  Auto merged
mysql-test/t/ps_5merge.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/replace.test:
  Auto merged
mysql-test/t/row.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
mysql-test/t/rpl000018.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_charset.test:
  Auto merged
mysql-test/t/rpl_create_database.test:
  Auto merged
mysql-test/t/rpl_ddl.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_empty_master_crash.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_flush_tables.test:
  Auto merged
mysql-test/t/rpl_get_lock.test:
  Auto merged
mysql-test/t/rpl_heap.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_m.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_multi_query.test:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/t/rpl_redirect.test:
  Auto merged
mysql-test/t/rpl_relayrotate.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/rpl_server_id2.test:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
mysql-test/t/rpl_timezone.test:
  Auto merged
mysql-test/t/rpl_user_variables.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysql-test/t/synchronization.test:
  Auto merged
mysql-test/t/system_mysql_db.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
mysql-test/t/temp_table.test:
  Auto merged
mysql-test/t/timezone2.test:
  Auto merged
mysql-test/t/timezone_grant.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_ranges.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
mysql-test/t/update.test:
  Auto merged
mysql-test/t/user_var-binlog.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8:
  Simple merge
mysql-test/r/ps_grant.result:
  Simple merge
mysql-test/t/analyse.test:
  Simple merge
mysql-test/t/auto_increment.test:
  Simple merge
mysql-test/t/bdb.test:
  Simple merge
mysql-test/t/bigint.test:
  Simple merge
mysql-test/t/case.test:
  Simple merge
mysql-test/t/cast.test:
  Simple merge
mysql-test/t/check.test:
  Simple merge
mysql-test/t/count_distinct.test:
  Simple merge
mysql-test/t/ctype_latin1_de.test:
  Simple merge
mysql-test/t/ctype_uca.test:
  Simple merge
mysql-test/t/ctype_ucs.test:
  Simple merge
mysql-test/t/ctype_utf8.test:
  Simple merge
mysql-test/t/delete.test:
  Simple merge
mysql-test/t/flush_block_commit.test:
  Simple merge
mysql-test/t/func_default.test:
  Simple merge
mysql-test/t/func_gconcat.test:
  Simple merge
mysql-test/t/func_group.test:
  Aligned code with 4.1
mysql-test/t/func_in.test:
  Simple merge
mysql-test/t/func_math.test:
  Simple merge
mysql-test/t/func_misc.test:
  Simple merge
mysql-test/t/func_test.test:
  Simple merge
mysql-test/t/func_time.test:
  Simple merge
mysql-test/t/group_by.test:
  Simple merge
mysql-test/t/having.test:
  Simple merge
mysql-test/t/innodb.test:
  Simple merge
mysql-test/t/insert.test:
  Simple merge
mysql-test/t/join_outer.test:
  Simple merge
mysql-test/t/kill.test:
  Simple merge
mysql-test/t/loaddata.test:
  Simple merge
mysql-test/t/lock_multi.test:
  Simple merge
mysql-test/t/multi_update.test:
  Simple merge
mysql-test/t/mysqlbinlog.test:
  Simple merge
mysql-test/t/mysqldump.test:
  Aligned code with 4.1
mysql-test/t/mysqltest.test:
  Simple merge
mysql-test/t/ndb_basic.test:
  Simple merge
mysql-test/t/ndb_cache.test:
  Simple merge
mysql-test/t/ndb_subquery.test:
  Simple merge
mysql-test/t/ps_grant.test:
  Simple merge
mysql-test/t/range.test:
  Simple merge
mysql-test/t/rpl_drop_temp.test:
  Simple merge
mysql-test/t/rpl_loaddata_rule_s.test:
  Simple merge
mysql-test/t/rpl_loaddatalocal.test:
  Simple merge
mysql-test/t/rpl_rotate_logs.test:
  Simple merge
mysql-test/t/rpl_until.test:
  Simple merge
mysql-test/t/rpl_variables.test:
  Simple merge
mysql-test/t/select.test:
  Simple merge
mysql-test/t/sql_mode.test:
  Simple merge
mysql-test/t/type_blob.test:
  Simple merge
mysql-test/t/type_decimal.test:
  Simple merge
mysql-test/t/user_var.test:
  Simple merge
mysql-test/t/variables.test:
  Simple merge
sql/lock.cc:
  Simple optimization
sql/mysql_priv.h:
  Simple merge
sql/sql_table.cc:
  Simple merge
sql/table.cc:
  Simple merge
sql/unireg.cc:
  Simple merge
 2005-07-28 17:09:54 +03:00
unknown
167fb5f170 Added end marker for tests to make future merges easier 
mysql-test/t/alias.test:
  Added end marker for test to make future merges easier
mysql-test/t/alter_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/analyse.test:
  Added end marker for test to make future merges easier
mysql-test/t/analyze.test:
  Added end marker for test to make future merges easier
  Fixed length of comment lines
mysql-test/t/ansi.test:
  Added end marker for test to make future merges easier
mysql-test/t/archive.test:
  Added end marker for test to make future merges easier
mysql-test/t/auto_increment.test:
  Added end marker for test to make future merges easier
mysql-test/t/backup.test:
  Added end marker for test to make future merges easier
mysql-test/t/bdb-alter-table-1.test:
  Added end marker for test to make future merges easier
mysql-test/t/bdb-alter-table-2.test:
  Added end marker for test to make future merges easier
mysql-test/t/bdb-crash.test:
  Added end marker for test to make future merges easier
mysql-test/t/bdb-deadlock.test:
  Added end marker for test to make future merges easier
mysql-test/t/bdb-deadlock.tminus:
  Added end marker for test to make future merges easier
mysql-test/t/bdb.test:
  Added end marker for test to make future merges easier
mysql-test/t/bdb_cache.test:
  Added end marker for test to make future merges easier
mysql-test/t/bench_count_distinct.test:
  Added end marker for test to make future merges easier
mysql-test/t/bigint.test:
  Added end marker for test to make future merges easier
mysql-test/t/binary.test:
  Added end marker for test to make future merges easier
mysql-test/t/blackhole.test:
  Added end marker for test to make future merges easier
mysql-test/t/bool.test:
  Added end marker for test to make future merges easier
mysql-test/t/bulk_replace.test:
  Added end marker for test to make future merges easier
mysql-test/t/case.test:
  Added end marker for test to make future merges easier
mysql-test/t/cast.test:
  Added end marker for test to make future merges easier
mysql-test/t/check.test:
  Added end marker for test to make future merges easier
mysql-test/t/comments.test:
  Added end marker for test to make future merges easier
mysql-test/t/compare.test:
  Added end marker for test to make future merges easier
mysql-test/t/connect.test:
  Added end marker for test to make future merges easier
mysql-test/t/consistent_snapshot.test:
  Added end marker for test to make future merges easier
mysql-test/t/constraints.test:
  Added end marker for test to make future merges easier
mysql-test/t/count_distinct.test:
  Added end marker for test to make future merges easier
mysql-test/t/count_distinct2.test:
  Added end marker for test to make future merges easier
mysql-test/t/count_distinct3.test:
  Added end marker for test to make future merges easier
mysql-test/t/create.test:
  Added end marker for test to make future merges easier
mysql-test/t/create_select_tmp.test:
  Added end marker for test to make future merges easier
mysql-test/t/csv.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_big5.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_collate.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_cp1250_ch.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_cp1251.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_cp932.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_create.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_gbk.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_latin1.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_latin1_de.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_latin2.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_many.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_mb.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_recoding.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_sjis.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_tis620.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_uca.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_ucs.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_ucs_binlog.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_ujis.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_utf8.test:
  Added end marker for test to make future merges easier
mysql-test/t/date_formats.test:
  Added end marker for test to make future merges easier
mysql-test/t/delayed.test:
  Added end marker for test to make future merges easier
mysql-test/t/delete.test:
  Added end marker for test to make future merges easier
mysql-test/t/derived.test:
  Added end marker for test to make future merges easier
mysql-test/t/dirty_close.test:
  Added end marker for test to make future merges easier
mysql-test/t/distinct.test:
  Added end marker for test to make future merges easier
mysql-test/t/drop.test:
  Added end marker for test to make future merges easier
mysql-test/t/drop_temp_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/empty_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/endspace.test:
  Added end marker for test to make future merges easier
mysql-test/t/errors.test:
  Added end marker for test to make future merges easier
mysql-test/t/exampledb.test:
  Added end marker for test to make future merges easier
mysql-test/t/explain.test:
  Added end marker for test to make future merges easier
mysql-test/t/flush.test:
  Added end marker for test to make future merges easier
mysql-test/t/flush_block_commit.test:
  Added end marker for test to make future merges easier
mysql-test/t/flush_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/foreign_key.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext2.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext_cache.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext_distinct.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext_left_join.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext_multi.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext_order_by.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext_update.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext_var.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_compress.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_concat.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_crypt.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_date_add.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_default.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_des_encrypt.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_encrypt.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_encrypt_nossl.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_equal.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_gconcat.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_group.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_if.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_in.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_isnull.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_like.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_math.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_misc.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_op.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_regexp.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_sapdb.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_set.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_str.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_system.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_test.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_time.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_timestamp.test:
  Added end marker for test to make future merges easier
mysql-test/t/gcc296.test:
  Added end marker for test to make future merges easier
mysql-test/t/gis-rtree.test:
  Added end marker for test to make future merges easier
mysql-test/t/gis.test:
  Added end marker for test to make future merges easier
mysql-test/t/grant.test:
  Added end marker for test to make future merges easier
mysql-test/t/grant2.test:
  Added end marker for test to make future merges easier
mysql-test/t/grant_cache.test:
  Added end marker for test to make future merges easier
mysql-test/t/group_by.test:
  Added end marker for test to make future merges easier
mysql-test/t/handler.test:
  Added end marker for test to make future merges easier
mysql-test/t/having.test:
  Added end marker for test to make future merges easier
mysql-test/t/heap.test:
  Added end marker for test to make future merges easier
mysql-test/t/heap_auto_increment.test:
  Added end marker for test to make future merges easier
mysql-test/t/heap_btree.test:
  Added end marker for test to make future merges easier
mysql-test/t/heap_hash.test:
  Added end marker for test to make future merges easier
mysql-test/t/help.test:
  Added end marker for test to make future merges easier
mysql-test/t/init_connect.test:
  Added end marker for test to make future merges easier
mysql-test/t/init_file.test:
  Added end marker for test to make future merges easier
mysql-test/t/innodb-deadlock.test:
  Added end marker for test to make future merges easier
mysql-test/t/innodb-lock.test:
  Added end marker for test to make future merges easier
mysql-test/t/innodb-replace.test:
  Added end marker for test to make future merges easier
mysql-test/t/innodb.test:
  Added end marker for test to make future merges easier
mysql-test/t/innodb_cache.test:
  Added end marker for test to make future merges easier
mysql-test/t/innodb_handler.test:
  Added end marker for test to make future merges easier
mysql-test/t/insert.test:
  Added end marker for test to make future merges easier
mysql-test/t/insert_select-binlog.test:
  Added end marker for test to make future merges easier
mysql-test/t/insert_select.test:
  Added end marker for test to make future merges easier
mysql-test/t/insert_update.test:
  Added end marker for test to make future merges easier
mysql-test/t/isam.test:
  Added end marker for test to make future merges easier
mysql-test/t/join.test:
  Added end marker for test to make future merges easier
mysql-test/t/join_crash.test:
  Added end marker for test to make future merges easier
mysql-test/t/join_outer.test:
  Added end marker for test to make future merges easier
mysql-test/t/key.test:
  Added end marker for test to make future merges easier
mysql-test/t/key_cache.test:
  Added end marker for test to make future merges easier
mysql-test/t/key_diff.test:
  Added end marker for test to make future merges easier
mysql-test/t/key_primary.test:
  Added end marker for test to make future merges easier
mysql-test/t/keywords.test:
  Added end marker for test to make future merges easier
mysql-test/t/kill.test:
  Added end marker for test to make future merges easier
mysql-test/t/limit.test:
  Added end marker for test to make future merges easier
mysql-test/t/loaddata.test:
  Added end marker for test to make future merges easier
mysql-test/t/lock.test:
  Added end marker for test to make future merges easier
mysql-test/t/lock_multi.test:
  Added end marker for test to make future merges easier
mysql-test/t/lock_tables_lost_commit.test:
  Added end marker for test to make future merges easier
mysql-test/t/lowercase_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/lowercase_table2.test:
  Added end marker for test to make future merges easier
mysql-test/t/lowercase_table3.test:
  Added end marker for test to make future merges easier
mysql-test/t/lowercase_table_grant.test:
  Added end marker for test to make future merges easier
mysql-test/t/lowercase_table_qcache.test:
  Added end marker for test to make future merges easier
mysql-test/t/merge.test:
  Added end marker for test to make future merges easier
mysql-test/t/metadata.test:
  Added end marker for test to make future merges easier
mysql-test/t/mix_innodb_myisam_binlog.test:
  Added end marker for test to make future merges easier
mysql-test/t/multi_statement.test:
  Added end marker for test to make future merges easier
mysql-test/t/multi_update.test:
  Added end marker for test to make future merges easier
mysql-test/t/myisam-blob.test:
  Added end marker for test to make future merges easier
mysql-test/t/myisam.test:
  Added end marker for test to make future merges easier
mysql-test/t/mysql_client_test.test:
  Added end marker for test to make future merges easier
mysql-test/t/mysql_protocols.test:
  Added end marker for test to make future merges easier
mysql-test/t/mysqlbinlog.test:
  Added end marker for test to make future merges easier
mysql-test/t/mysqlbinlog2.test:
  Added end marker for test to make future merges easier
mysql-test/t/mysqldump.test:
  Added end marker for test to make future merges easier
mysql-test/t/mysqltest.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_alter_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_autodiscover.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_autodiscover2.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_basic.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_blob.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_cache.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_charset.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_config.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_database.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_grant.later:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_index.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_index_ordered.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_index_unique.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_insert.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_limit.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_lock.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_minmax.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_multi.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_replace.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_restore.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_subquery.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_transaction.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_truncate.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_types.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_update.test:
  Added end marker for test to make future merges easier
mysql-test/t/negation_elimination.test:
  Added end marker for test to make future merges easier
mysql-test/t/not_embedded_server.test:
  Added end marker for test to make future merges easier
mysql-test/t/null.test:
  Added end marker for test to make future merges easier
mysql-test/t/null_key.test:
  Added end marker for test to make future merges easier
mysql-test/t/odbc.test:
  Added end marker for test to make future merges easier
mysql-test/t/olap.test:
  Added end marker for test to make future merges easier
mysql-test/t/openssl_1.test:
  Added end marker for test to make future merges easier
mysql-test/t/order_by.test:
  Added end marker for test to make future merges easier
mysql-test/t/order_fill_sortbuf.test:
  Added end marker for test to make future merges easier
mysql-test/t/outfile.test:
  Added end marker for test to make future merges easier
mysql-test/t/overflow.test:
  Added end marker for test to make future merges easier
mysql-test/t/packet.test:
  Added end marker for test to make future merges easier
mysql-test/t/preload.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_10nestset.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_11bugs.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_1general.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_2myisam.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_3innodb.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_4heap.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_5merge.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_6bdb.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_7ndb.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_grant.test:
  Added end marker for test to make future merges easier
mysql-test/t/query_cache.test:
  Added end marker for test to make future merges easier
mysql-test/t/query_cache_merge.test:
  Added end marker for test to make future merges easier
mysql-test/t/raid.test:
  Added end marker for test to make future merges easier
mysql-test/t/range.test:
  Added end marker for test to make future merges easier
mysql-test/t/rename.test:
  Added end marker for test to make future merges easier
mysql-test/t/repair.test:
  Added end marker for test to make future merges easier
mysql-test/t/replace.test:
  Added end marker for test to make future merges easier
mysql-test/t/rollback.test:
  Added end marker for test to make future merges easier
mysql-test/t/row.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000001.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000002.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000004.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000005.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000006.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000008.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000009.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000010.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000011.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000012.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000013.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000015.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000017.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000018.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_EE_error.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_alter.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_chain_temp_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_change_master.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_charset.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_commit_after_flush.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_create_database.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_ddl.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_deadlock.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_delete_all.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_do_grant.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_drop.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_drop_temp.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_empty_master_crash.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_error_ignored_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_failed_optimize.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_failsafe.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_flush_log_loop.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_flush_tables.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_free_items.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_get_lock.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_heap.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_ignore_grant.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_init_slave.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_innodb.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_insert_id.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_insert_ignore.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_loaddata.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_loaddata_rule_m.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_loaddata_rule_s.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_loaddatalocal.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_log.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_log_pos.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_many_optimize.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_master_pos_wait.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_max_relay_size.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_misc_functions.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_delete.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_delete2.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_query.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_update.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_update2.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_update3.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_mystery22.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_openssl.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_optimize.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_ps.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_redirect.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_relayrotate.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_relayspace.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_replicate_do.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_reset_slave.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_rewrite_db.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_rotate_logs.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_server_id1.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_server_id2.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_set_charset.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_skip_error.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_sporadic_master.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_start_stop_slave.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_temporary.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_timezone.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_trunc_binlog.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_until.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_user_variables.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_variables.test:
  Added end marker for test to make future merges easier
mysql-test/t/select.test:
  Added end marker for test to make future merges easier
mysql-test/t/select_found.test:
  Added end marker for test to make future merges easier
mysql-test/t/select_safe.test:
  Added end marker for test to make future merges easier
mysql-test/t/show_check.test:
  Added end marker for test to make future merges easier
mysql-test/t/skip_name_resolve.test:
  Added end marker for test to make future merges easier
mysql-test/t/sql_mode.test:
  Added end marker for test to make future merges easier
mysql-test/t/status.test:
  Added end marker for test to make future merges easier
mysql-test/t/subselect.test:
  Added end marker for test to make future merges easier
mysql-test/t/subselect2.test:
  Added end marker for test to make future merges easier
mysql-test/t/subselect_gis.test:
  Added end marker for test to make future merges easier
mysql-test/t/subselect_innodb.test:
  Added end marker for test to make future merges easier
mysql-test/t/symlink.test:
  Added end marker for test to make future merges easier
mysql-test/t/synchronization.test:
  Added end marker for test to make future merges easier
mysql-test/t/system_mysql_db.test:
  Added end marker for test to make future merges easier
mysql-test/t/system_mysql_db_fix.test:
  Added end marker for test to make future merges easier
mysql-test/t/system_mysql_db_refs.test:
  Added end marker for test to make future merges easier
mysql-test/t/tablelock.test:
  Added end marker for test to make future merges easier
mysql-test/t/temp_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/timezone.test:
  Added end marker for test to make future merges easier
mysql-test/t/timezone2.test:
  Added end marker for test to make future merges easier
mysql-test/t/timezone3.test:
  Added end marker for test to make future merges easier
mysql-test/t/timezone_grant.test:
  Added end marker for test to make future merges easier
mysql-test/t/truncate.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_blob.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_date.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_datetime.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_decimal.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_enum.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_float.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_nchar.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_ranges.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_set.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_time.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_timestamp.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_uint.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_year.test:
  Added end marker for test to make future merges easier
mysql-test/t/union.test:
  Added end marker for test to make future merges easier
mysql-test/t/update.test:
  Added end marker for test to make future merges easier
mysql-test/t/user_var-binlog.test:
  Added end marker for test to make future merges easier
mysql-test/t/user_var.test:
  Added end marker for test to make future merges easier
mysql-test/t/varbinary.test:
  Added end marker for test to make future merges easier
mysql-test/t/variables.test:
  Added end marker for test to make future merges easier
mysql-test/t/warnings.test:
  Added end marker for test to make future merges easier
 2005-07-28 03:22:47 +03:00
unknown
b863330d43 Fix for bug #11083 (myisam test fails witout-geometry) 
mysql-test/r/myisam.result:
  test result fixed
mysql-test/t/myisam.test:
  we can get two kings of errors here
 2005-07-27 21:54:02 +05:00
unknown
f8a20dbeb6 Resolve merge from 4.1 
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
client/mysqldump.c:
  Resolve merge
mysql-test/r/myisam.result:
  Resolve merge
mysql-test/r/mysqldump.result:
  Resolve merge
mysql-test/r/olap.result:
  Resolve merge
mysql-test/r/subselect.result:
  Resolve merge
mysql-test/t/myisam.test:
  Resolve merge
mysql-test/t/mysqldump.test:
  Resolve merge
mysql-test/t/olap.test:
  Resolve merge
mysql-test/t/range.test:
  Resolve merge
mysql-test/t/subselect.test:
  Resolve merge
ndb/src/common/util/version.c:
  Resolve merge
ndb/src/ndbapi/ndberror.c:
  Resolve merge
sql/item.cc:
  Resolve merge
sql/item_strfunc.h:
  Resolve merge
sql/sql_select.cc:
  Resolve merge
sql/sql_yacc.yy:
  Resolve merge
 2005-05-18 11:06:34 -07:00
unknown
f8bb892314 Fix for BUG#9622: Make index statistics collection in MyISAM behave the same 
way in ALTER TABLE ... ENABLE KEYS, ANALYZE TABLE and after bulk insert:
now statistics collection always assumes NULLs are inequal. 


mysql-test/r/myisam.result:
  Testcase for BUG#9622
mysql-test/t/myisam.test:
  Testcase for BUG#9622
 2005-05-14 00:21:53 +02:00
unknown
b21cf962e3 concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file 
myisam_max_extra_sort_file_size is depricated
Ensure that myisam_data_pointer_size is honoured when creating new MyISAM files
Changed default value of myisam_data_pointer_size from 4 to 6 to get rid of 'table-is-full' errors



include/myisam.h:
  Change type of myisam_block_size and myisam_concurrent_insert to make them changeable in mysqld.cc
  Removed not used varaible myisam_max_extra_temp_length
include/thr_lock.h:
  Added extra parameter to get_status
myisam/mi_create.c:
  Ensure that myisam_data_pointer_size is honoured
myisam/mi_dynrec.c:
  If 'append_insert_at_end' is set, only write at end of myisam record file
myisam/mi_locking.c:
  Add extra argument to 'mi_get_status' to allow thr_lock to signal that we want to do a concurrent insert
  If this is used, we will append new insert rows at end of data file.
  Change mi_check_status() to allow concurrent_inserts even if there are holes in the file when myisam_concurent_insert=2
myisam/mi_static.c:
  Change behavior of myisam_concurrent_insert so that setting this to 2 allows inserts even if there is a hole in the data file.
  Default value is 2 for MyISAM direct usage but will be set to 1 (old default) by mysqld.cc
myisam/mi_statrec.c:
  If 'append_insert_at_end' is set, only write at end of myisam record file
myisam/mi_write.c:
  If 'append_insert_at_end' is set, only write at end of myisam record file
myisam/myisamdef.h:
  Support for insert-at-end even if there is holes in data file
mysql-test/r/gis-rtree.result:
  Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
mysql-test/r/group_min_max.result:
  Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
mysql-test/r/index_merge.result:
  Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
mysql-test/r/index_merge_ror.result:
  Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
mysql-test/r/merge.result:
  Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
mysql-test/r/myisam.result:
  Test of concurrent_insert=2
mysql-test/r/null.result:
  Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
mysql-test/r/preload.result:
  Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
mysql-test/r/ps_1general.result:
  Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
mysql-test/r/range.result:
  Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
mysql-test/r/variables.result:
  concurrent_insert is now a integer, not a boolean
  myisam_extra_sort_file_size is deleted
mysql-test/r/view.result:
  Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
mysql-test/t/index_merge.test:
  Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
mysql-test/t/myisam.test:
  Test of concurrent_insert=2
mysql-test/t/ps_1general.test:
  Drop test table
mysql-test/t/variables.test:
  concurrent_insert is now a integer, not a boolean
  myisam_extra_sort_file_size is deleted
mysql-test/t/view.test:
  Drop tables that may be left from previous tests
mysys/thr_lock.c:
  Extra paramter to get_status to signal if concurrent_insert was used
sql/mysqld.cc:
  concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file
  myisam_max_extra_sort_file_size is depricated
sql/set_var.cc:
  concurrent-insert is now an integer, not a bool
  myisam_max_extra_sort_file_size is deleted
 2005-05-13 12:08:08 +03:00
unknown
cef7e66e98 Merge 
myisam/mi_search.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
mysql-test/t/myisam.test:
  SCCS merged
 2005-04-16 17:58:11 +02:00
unknown
7ff8fc73c9 Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145) 
Since 4.1 keys are compared with trailing spaces. 
Thus, a "x " key can be inserted between a couple of "x" keys.
The existing code did not take this into account. Though the
comments in the code claimed it did.


myisam/mi_search.c:
  Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
  Fixed some function comments.
  In the case when we insert a different key between two identical keys,
  the difference must be additional spaces. In this case the prefix is 
  the same as that of the new key instead of the (zero) remaining length.
myisam/mi_write.c:
  Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
  Fixed a function comment.
mysql-test/r/myisam.result:
  Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
  The test result.
mysql-test/t/myisam.test:
  Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
  The test case.
 2005-04-08 14:13:02 +02:00
unknown
1c5ca8061d Move handler dependent tests to the specific handler (myisam, bdb, innodb) 
Enabled VARCHAR testing for innodb

NOTE: innodb.test currently fails becasue of a bug in InnoDB. 
I have informed Heikki about this and expect him to fix this ASAP


mysql-test/include/varchar.inc:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
mysql-test/r/innodb.result:
  Added varchar tests
mysql-test/r/myisam.result:
  Update results
mysql-test/t/bdb.test:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
mysql-test/t/innodb.test:
  Enabled VARCHAR testing
mysql-test/t/myisam.test:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
sql/sql_parse.cc:
  Indentation fixes
sql/sql_table.cc:
  Fixed bug introduced when doing cleanup
 2005-03-17 01:22:12 +02:00
unknown
cc4455631a Merge 
innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
mysql-test/t/myisam.test:
  SCCS merged
sql/ha_innodb.h:
  SCCS merged
 2005-03-02 10:56:13 +01:00
unknown
26f75ffc83 Bug#8306 - TRUNCATE leads to index corruption 
Added a check, if the table, which we are going to create, is open.
This can happen if a MERGE mapped table is TRUNCATEd.


myisam/mi_open.c:
  Bug#8306 - TRUNCATE leads to index corruption
  Made test_if_reopen() globally available.
myisam/myisamdef.h:
  Bug#8306 - TRUNCATE leads to index corruption
  Declared test_if_reopen() as globally available.
mysql-test/r/myisam.result:
  Bug#8306 - TRUNCATE leads to index corruption
  The test result.
mysql-test/t/myisam.test:
  Bug#8306 - TRUNCATE leads to index corruption
  The test case.
 2005-03-02 10:35:00 +01:00
unknown
eb18f93a78 Show all generated warnings in SHOW ERROR 
Previously we only stored the first given error (the error sent to the client)


include/mysys_err.h:
  Moved ER_FILENOTFOUND last to avoid getting 'error 0'
mysql-test/r/backup.result:
  More warnings from in case of errors
mysql-test/r/innodb.result:
  More warnings from in case of errors
mysql-test/r/key_cache.result:
  More warnings from in case of errors
mysql-test/r/myisam.result:
  More warnings from in case of errors
mysql-test/r/preload.result:
  More warnings from in case of errors
mysql-test/r/repair.result:
  More warnings from in case of errors
mysql-test/r/rpl_failed_optimize.result:
  More warnings from in case of errors
mysql-test/r/subselect.result:
  More warnings from in case of errors
mysql-test/t/backup.test:
  Portability fix
mysql-test/t/innodb.test:
  Avoid some warnings
mysql-test/t/myisam.test:
  Portability fix
mysql-test/t/rpl_rotate_logs.test:
  Portablitiy fix
mysys/errors.c:
  Move ER_FILENOTFOUND last to avoid error 0
sql/mysql_priv.h:
  Indentation change
sql/mysqld.cc:
  Save all given errors for SHOW ERRORS
sql/protocol.cc:
  Store new errors for SHOW ERROR
  (Ignore those that are already reported with my_error())
sql/sql_class.cc:
  More errors with SHOW ERROR
sql/sql_class.h:
  More errors with SHOW ERROR
sql/sql_error.cc:
  More errors with SHOW ERROR
sql/sql_parse.cc:
  Temporary fix: Don't give error for the to-be-removed 'pre-open tables code'
sql/sql_show.cc:
  More debugging
  Don't register errors while populating schema tables.
  (If we do, we get a LOT of warnings from information_schema.test)
sql/sql_table.cc:
  Don't register errors from handler in drop table (as we already do it the upper level DROP TABLE code)
  Don't register errors for 'restore_table' as in most cases the table doesn't exists
sql/sql_union.cc:
  Use file->write_row() instead of 'write_record'.
  This gives us easer to handle error messages and is faster than the old version
 2005-02-24 23:33:42 +02:00
unknown
6965e72bd0 Fixed compiler warnings 
Fixed failing myisam.test and rpl_rotate_logs.test on some configurations


mysql-test/r/myisam.result:
  Portability fix
mysql-test/r/rpl_rotate_logs.result:
  Portability fix
mysql-test/t/myisam.test:
  Depending on if you compiled with -DHAVE_RAID or not, you could get different errors for this test
mysql-test/t/rpl_rotate_logs.test:
  Portability fix
sql/ha_innodb.cc:
  Fixed compiler warnings
 2005-02-22 14:15:50 +02:00
unknown
8cb6031dd7 Generate warning in ha_delete_table() if files is missing in handler 
mysql-test/r/myisam.result:
  Test of DROP TABLE when .MYI or .MYD is missing
mysql-test/r/ndb_autodiscover.result:
  Update test results
mysql-test/r/rpl_EE_error.result:
  Change test to conform with new handling of drop table when handler file is missing
mysql-test/t/myisam.test:
  Test of DROP TABLE when .MYI or .MYD is missing
mysql-test/t/rpl_EE_error.test:
  Change test to conform with new handling of drop table when handler file is missing
sql/handler.cc:
  Generate a warning in ha_delete_table() if we get an error from 'delete_table()'
sql/handler.h:
  More parameters to ha_delete_table() so that we can generate better error messages
sql/sql_table.cc:
  Generate warning in ha_delete_table()
 2005-02-21 20:41:48 +02:00
unknown
8379b61efb Merge with new VARCHAR code 
configure.in:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
  Auto merged
BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
heap/hp_create.c:
  Auto merged
heap/hp_delete.c:
  Auto merged
heap/hp_hash.c:
  Auto merged
heap/hp_write.c:
  Auto merged
include/decimal.h:
  Auto merged
include/m_ctype.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
mysql-test/r/ctype_tis620.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/endspace.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.cc:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
strings/decimal.c:
  Auto merged
tests/client_test.c:
  Auto merged
mysql-test/r/bdb.result:
  Merge with VARCHAR code
mysql-test/r/heap.result:
  Merge with VARCHAR code
mysql-test/r/innodb.result:
  Merge with VARCHAR code
mysql-test/r/select.result.es:
  Merge with VARCHAR code
mysql-test/t/bdb.test:
  Merge with VARCHAR code
mysql-test/t/heap.test:
  Merge with VARCHAR code
mysql-test/t/innodb.test:
  Merge with VARCHAR code
sql/field.cc:
  Merge with VARCHAR code
sql/item.cc:
  Merge with VARCHAR code
sql/sql_acl.cc:
  Merge with VARCHAR code
sql/sql_parse.cc:
  Merge with VARCHAR code
sql/sql_table.cc:
  Merge with VARCHAR code
sql/sql_update.cc:
  Merge with VARCHAR code
sql/table.h:
  Merge with VARCHAR code
strings/ctype-mb.c:
  Don't pad my_like_range with max_str for simple LIKE expression
strings/ctype-tis620.c:
  Merge with VARCHAR code
strings/ctype-ucs2.c:
  Added new argument to my_strnncollsp_ucs2()
  Simply code
 2004-12-06 19:18:35 +02:00
unknown
a8ea31fae6 Add support for up to VARCHAR (size up to 65535) 
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short


BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
  Delete: sql/ha_isam.cc
BitKeeper/deleted/.del-_cache.c~b5d80b5c3ae233b1:
  Delete: isam/_cache.c
BitKeeper/deleted/.del-_dbug.c~88d7964ae5e3c9bd:
  Delete: isam/_dbug.c
BitKeeper/deleted/.del-_dynrec.c~48dd758f5a5450df:
  Delete: isam/_dynrec.c
BitKeeper/deleted/.del-_key.c~ce62d47a6c681084:
  Delete: isam/_key.c
BitKeeper/deleted/.del-_locking.c~dea4cdc6ea425c67:
  Delete: isam/_locking.c
BitKeeper/deleted/.del-_packrec.c~47ae1b16c007e9be:
  Delete: isam/_packrec.c
BitKeeper/deleted/.del-_page.c~148b1a613d052ee8:
  Delete: isam/_page.c
BitKeeper/deleted/.del-_search.c~f509292aa1ff18ff:
  Delete: isam/_search.c
BitKeeper/deleted/.del-_statrec.c~58d9263b3475d58b:
  Delete: isam/_statrec.c
BitKeeper/deleted/.del-changed.c~d075de80a314b02d:
  Delete: isam/changed.c
BitKeeper/deleted/.del-close.c~fd62629496ee5bcc:
  Delete: isam/close.c
BitKeeper/deleted/.del-create.c~96cecc433c0c2242:
  Delete: isam/create.c
BitKeeper/deleted/.del-delete.c~65ee8daaa75a14b6:
  Delete: isam/delete.c
BitKeeper/deleted/.del-extra.c~706f29d72beb2565:
  Delete: isam/extra.c
BitKeeper/deleted/.del-info.c~96cfb747af8da0d:
  Delete: isam/info.c
BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f:
  Delete: isam/isamchk.c
BitKeeper/deleted/.del-isamlog.c~85b6b31c6e2b8519:
  Delete: isam/isamlog.c
BitKeeper/deleted/.del-log.c~55a973013d55cade:
  Delete: isam/log.c
BitKeeper/deleted/.del-open.c~95b3b75042fae00a:
  Delete: isam/open.c
BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
  Delete: isam/pack_isam.c
BitKeeper/deleted/.del-panic.c~f7fd71605324f8f3:
  Delete: isam/panic.c
BitKeeper/deleted/.del-range.c~142f1f8ac4948082:
  Delete: isam/range.c
BitKeeper/deleted/.del-rfirst.c~66f494291dc005d3:
  Delete: isam/rfirst.c
BitKeeper/deleted/.del-rkey.c~cc54c6498352f999:
  Delete: isam/rkey.c
BitKeeper/deleted/.del-rlast.c~d1fe1866139e9866:
  Delete: isam/rlast.c
BitKeeper/deleted/.del-rnext.c~b308eaa1e11ea7de:
  Delete: isam/rnext.c
BitKeeper/deleted/.del-rprev.c~b359f71fdea4bbce:
  Delete: isam/rprev.c
BitKeeper/deleted/.del-rrnd.c~7fcfcce88d4a5200:
  Delete: isam/rrnd.c
BitKeeper/deleted/.del-rsame.c~75a62d5548103a15:
  Delete: isam/rsame.c
BitKeeper/deleted/.del-rsamepos.c~5b5652dd2cda6d5d:
  Delete: isam/rsamepos.c
BitKeeper/deleted/.del-sort.c~e2e56b5a37ce86f4:
  Delete: isam/sort.c
BitKeeper/deleted/.del-static.c~3a1354b84f4a9cc7:
  Delete: isam/static.c
BitKeeper/deleted/.del-test1.c~64d52e9412d457ed:
  Delete: isam/test1.c
BitKeeper/deleted/.del-test2.c~2f9a632cab572958:
  Delete: isam/test2.c
BitKeeper/deleted/.del-test3.c~e8a7a4afe8a087:
  Delete: isam/test3.c
BitKeeper/deleted/.del-isamdef.h~ac8d49e7e2201c66:
  Delete: isam/isamdef.h
BitKeeper/deleted/.del-update.c~670264f51dc44934:
  Delete: isam/update.c
BitKeeper/deleted/.del-write.c~8f1918b1f6770e54:
  Delete: isam/write.c
BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09:
  Delete: isam/Makefile.am
BitKeeper/deleted/.del-make-ccc~3ee55391eda0b0ab:
  Delete: isam/make-ccc
BitKeeper/deleted/.del-ChangeLog~208984fb7a51e568:
  Delete: isam/ChangeLog
BitKeeper/deleted/.del-test_all.res~c2aafb49a3a77db7:
  Delete: isam/test_all.res
BitKeeper/deleted/.del-test_all~93c701e44a9c5b65:
  Delete: isam/test_all
BitKeeper/deleted/.del-.cvsignore~54f6f0f2d5012561:
  Delete: isam/.cvsignore
BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
  Delete: sql/ha_isammrg.cc
BitKeeper/deleted/.del-ha_isam.h~bf53d533be3d3927:
  Delete: sql/ha_isam.h
BitKeeper/deleted/.del-ha_isammrg.h~66fd2e5bfe7207dc:
  Delete: sql/ha_isammrg.h
acinclude.m4:
  Remove ISAM
client/mysqldump.c:
  FIELD_TYPE -> MYSQL_TYPE
client/mysqltest.c:
  Add missing DBUG_RETURN
configure.in:
  Remove ISAM
heap/heapdef.h:
  Add support for VARCHAR
heap/hp_create.c:
  Add support for VARCHAR
heap/hp_delete.c:
  Add support for VARCHAR
heap/hp_hash.c:
  Add support for VARCHAR
  (VARCHAR keys was not supported before)
heap/hp_rkey.c:
  Add support for VARCHAR
heap/hp_update.c:
  Add support for VARCHAR
heap/hp_write.c:
  Add support for VARCHAR
  (Added flag SEARCH_UPDATE to mark that this is an update)
include/decimal.h:
  Remove not needed my_global.h
include/m_ctype.h:
  Add support for VARCHAR
include/my_base.h:
  Add support for VARCHAR
include/my_handler.h:
  Moved general purpose macro from MyISAM code
include/mysql_com.h:
  Add support for VARCHAR
libmysql/libmysql.c:
  Add support for VARCHAR
libmysqld/Makefile.am:
  Removed ISAM
myisam/ft_static.c:
  Add support for VARCHAR
myisam/ft_test1.c:
  Add support for VARCHAR
myisam/ft_update.c:
  Add support for VARCHAR
myisam/mi_check.c:
  Add support for VARCHAR
myisam/mi_create.c:
  Add support for VARCHAR
  - VARCHAR key segments are marked with HA_VAR_LENGTH_PART
myisam/mi_key.c:
  Add support for VARCHAR
  Fixed bug in old VARCHAR code when reading index-only
myisam/mi_range.c:
  Fixed comment style
myisam/mi_rnext_same.c:
  Handle case where equal keys can be of different length
myisam/mi_search.c:
  Add support for VARCHAR
myisam/mi_test1.c:
  Add support for VARCHAR
myisam/mi_unique.c:
  Add support for VARCHAR
  (Some new code to handle keys that are equal but have different lengths)
myisam/mi_write.c:
  Fixed comment
myisam/myisamchk.c:
  Better infotext if wrong type
mysql-test/r/bdb.result:
  Updated old result and new results for VARCHAR
mysql-test/r/create.result:
  Updated old result and new results for VARCHAR
mysql-test/r/ctype_tis620.result:
  Updated old result and new results for VARCHAR
  (Old code sorted tis620 wrong)
mysql-test/r/ctype_ucs.result:
  Updated old result and new results for VARCHAR
mysql-test/r/endspace.result:
  Updated old result and new results for VARCHAR
mysql-test/r/func_like.result:
  Updated old result and new results for VARCHAR
mysql-test/r/heap.result:
  Updated old result and new results for VARCHAR
mysql-test/r/innodb.result:
  Updated old result. This will change a bit when also InnoDB supports VARCHAR
mysql-test/r/merge.result:
  Updated old result and new results for VARCHAR
mysql-test/r/myisam.result:
  Updated old result and new results for VARCHAR
mysql-test/r/mysqldump.result:
  Updated old result and new results for VARCHAR
mysql-test/r/order_by.result:
  Updated old result and new results for VARCHAR
  (Key length is different for VARCHAR)
mysql-test/r/ps.result:
  Updated old result and new results for VARCHAR
mysql-test/r/ps_1general.result:
  Updated results for new .frm version
  Don't print seconds in show full process list as this may change
mysql-test/r/ps_2myisam.result:
  Updated old result and new results for VARCHAR
mysql-test/r/ps_3innodb.result:
  Updated old result and new results for VARCHAR
mysql-test/r/ps_4heap.result:
  Updated old result and new results for VARCHAR
mysql-test/r/ps_5merge.result:
  Updated old result and new results for VARCHAR
mysql-test/r/ps_6bdb.result:
  Updated old result and new results for VARCHAR
mysql-test/r/select.result.es:
  Updated results by hand
mysql-test/r/select.result:
  Updated old result and new results for VARCHAR
mysql-test/r/select_found.result:
  Updated old result and new results for VARCHAR
mysql-test/r/show_check.result:
  Updated old result and new results for VARCHAR
mysql-test/r/strict.result:
  Updated old result and new results for VARCHAR
mysql-test/r/subselect.result:
  Updated old result and new results for VARCHAR
mysql-test/r/system_mysql_db.result:
  Updated old result and new results for VARCHAR
mysql-test/r/type_blob.result:
  Updated old result and new results for VARCHAR
mysql-test/r/type_ranges.result:
  Updated old result and new results for VARCHAR
mysql-test/r/type_ranges.result.es:
  Updated some results by hand
mysql-test/t/bdb.test:
  Test VARCHAR
mysql-test/t/ctype_ucs.test:
  Some fixes related to VARCHAR
mysql-test/t/endspace.test:
  Fixes to make it easier to compare columns with end space
mysql-test/t/heap.test:
  Test VARCHAR
mysql-test/t/innodb.test:
  Prepare for testing VARCHAR
mysql-test/t/myisam.test:
  Test VARCHAR
mysql-test/t/ps_1general.test:
  Don't show seconds for show processlist
mysql-test/t/ps_4heap.test:
  Update for VARCHAR
mysql-test/t/strict.test:
  Fix test for VARCHAR
mysql-test/t/type_blob.test:
  Update test for VARCHAR
  Note that now you can't store 'a' and 'a ' in an unique varchar/text index if the column is not binary
mysys/my_handler.c:
  Add support for VARCHAR
ndb/src/common/util/NdbSqlUtil.cpp:
  Fix for usage of strnncollsp
scripts/mysql_fix_privilege_tables.sh:
  Simple fix so that my_print_defaults works
sql/Makefile.am:
  Remove ISAM
sql/field.cc:
  Add support for VARCHAR
  Fixed the keys for blob's are compared with strnncollsp
  Ensure that old tables from MySQL 4.0 works as they did before.
  (Old VARCHAR will be converted to new VARCHAR on ALTER TABLE)
sql/field.h:
  Add support for VARCHAR
sql/field_conv.cc:
  Change FIELD_TYPE_VAR_STRING -> MYSQL_TYPE_VARCHAR
  Added usage of HA_KEY_BLOB_LENGTH
sql/ha_berkeley.cc:
  Add support for VARCHAR
  Added usage of table->insert_or_update if we would ever want to know in key_cmp if we are changing keys
sql/ha_heap.cc:
  Add support for VARCHAR
sql/ha_innodb.cc:
  Changed MYSQL_TYPE_VAR_STRING to MYSQL_TYPE_VARCHAR.
  Waiting for Heikki to add full VARCHAR support
sql/ha_innodb.h:
  InnoDB doesn't support full VARCHAR yet
sql/ha_myisam.cc:
  Add support for VARCHAR
sql/ha_ndbcluster.cc:
  Add support for VARCHAR
sql/handler.h:
  Added HA_NO_VARCHAR for table handler that doesn't support VARCHAR. In this case MySQL will create a normal CHAR instead
sql/item.cc:
  Fixed access of already freed memory
  Added support of VARCHAR
  - varchar length is now checked in mysql_prepare
sql/item_cmpfunc.cc:
  Added new parameter to strncollsp
sql/item_sum.cc:
  Added new parameter to strncollsp
  FIELD_TYPE -> MYSQL_TYPE
sql/key.cc:
  Add support for VARCHAR
sql/opt_range.cc:
  Remove character set parameter from set_key_image()
sql/opt_sum.cc:
  Remove character set parameter from set_key_image()
sql/protocol.cc:
  Return MYSQL_TYPE_VAR_STRING instead of MYSQL_TYPE_VARCHAR to clients (to not cause compatiblity problems)
sql/sql_acl.cc:
  Change key handling code so that we can use CHAR or VARCHAR for the user table columns
sql/sql_base.cc:
  Remove old, not used code
sql/sql_help.cc:
  Remove charset from get_key_image
sql/sql_parse.cc:
  Ensure that OPTION_TABLE_LOCK is cleared ASAP; This fixed a problem in BDB transaction code when one used LOCK TABLES on a BDB table
  Added support for VARCHAR
  Moved field length checking and VARCHAR -> TEXT convert to mysql_prepare (as we need the know the character set for the column)
sql/sql_select.cc:
  Added support of VARCHAR
  Added heuristic to use fixed size rows for tmp tables if we are using only a few short VARCHAR's
sql/sql_string.cc:
  Added extra argument to strnncollsp
sql/sql_table.cc:
  Add support for VARCHAR
  Automaticly convert (with warning) big VARCHAR (but not CHAR) to TEXT
  If handler doesn't support VARCHAR convert VARCHAR to CHAR
sql/sql_update.cc:
  Fixed compiler warning
sql/sql_yacc.yy:
  Add support for VARCHAR
sql/strfunc.cc:
  Fixed valgrind warning
sql/structs.h:
  Added 'table' to KEY structure to make life easier for some handler functions
sql/table.cc:
  Add support for VARCHAR
  - New .frm version
  - FIELD_TYPE -> MYSQL_TYPE
sql/table.h:
  Added insert_or_update; A bool flag a handler can set/reset if needed (for handler internal usage)
sql/unireg.h:
  Add support for VARCHAR
strings/ctype-big5.c:
  Added new argument to strnncollsp() to allow one to define if end space are significant or not
  Changed my_like_range... to correctly calculate min_length & max_length
strings/ctype-bin.c:
  Added new argument to strnncollsp() to allow one to define if end space are significant or not
strings/ctype-czech.c:
  Changed my_like_range... to correctly calculate min_length & max_length
strings/ctype-gbk.c:
  Added new argument to strnncollsp() to allow one to define if end space are significant or not
  Changed my_like_range... to correctly calculate min_length & max_length
strings/ctype-latin1.c:
  Added new argument to strnncollsp() to allow one to define if end space are significant or not
strings/ctype-mb.c:
  Added new argument to strnncollsp() to allow one to define if end space are significant or not
  Changed my_like_range... to correctly calculate min_length & max_length
strings/ctype-simple.c:
  Added new argument to strnncollsp() to allow one to define if end space are significant or not
  Changed my_like_range... to correctly calculate min_length & max_length
strings/ctype-sjis.c:
  Added new argument to strnncollsp() to allow one to define if end space are significant or not
  Changed my_like_range... to correctly calculate min_length & max_length
strings/ctype-tis620.c:
  Added new argument to strnncollsp() to allow one to define if end space are significant or not
  Changed my_like_range... to correctly calculate min_length & max_length
strings/ctype-uca.c:
  Added new argument to strnncollsp() to allow one to define if end space are significant or not
strings/ctype-ucs2.c:
  Changed my_like_range... to correctly calculate min_length & max_length
strings/ctype-utf8.c:
  Added new argument to strnncollsp() to allow one to define if end space are significant or not
strings/ctype-win1250ch.c:
  Changed my_like_range... to correctly calculate min_length & max_length
strings/decimal.c:
  Fixed include files usage
  Fixed some compiler warnings
tests/client_test.c:
  Ensure tests works with VARCHAR
 2004-12-06 02:00:37 +02:00