Commit graph

362 commits

Author SHA1 Message Date
unknown
056c71f1ae memory leak fixed 2001-11-24 17:45:22 +01:00
unknown
b0da89d3ac Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2001-11-22 19:40:50 +01:00
unknown
8b5eedb725 ft_boolean_syntax variable
myisam/ft_nlq_search.c:
  comments cleanup
2001-11-22 19:35:35 +01:00
unknown
38357b30e6 Fixed fulltext after merge from 3.23.45
First (incomplete) version of transaction and as3ap tests.


BitKeeper/etc/ignore:
  Added sql-bench/test-transactions to the ignore list
mysql-test/r/fulltext.result:
  Update fulltext results after merge
sql-bench/Makefile.am:
  Added transaction test
sql-bench/run-all-tests.sh:
  Added transaction test
sql-bench/server-cfg.sh:
  Added transaction test
sql-bench/test-ATIS.sh:
  Cleanup
sql/item_func.cc:
  Fix bad merge
sql/mysqld.cc:
  Cleanup
sql/sql_base.cc:
  Fix bad merge
sql/sql_delete.cc:
  Cleanup
sql/sql_parse.cc:
  Fix bad merge
sql/sql_select.cc:
  Fix bad merge
sql/sql_union.cc:
  Fix bad merge
tools/mysqlmanager.c:
  C
2001-11-22 17:55:18 +02:00
unknown
198df9007e fixes for ft-boolean and range optimizer 2001-11-22 16:00:11 +01:00
unknown
d576cd65d0 Fix bug when repairing compressed MyISAM files
LOCATE() is now case sensitive


BUILD/compile-alpha-cxx:
  Don't build manager because it fails with linker error on Linux Alpha
Docs/manual.texi:
  Changelog
myisam/mi_check.c:
  Fix bug when repairing compressed MyISAM files
myisam/mi_open.c:
  Fix bug when repairing compressed MyISAM files
myisam/mi_packrec.c:
  Fix bug when repairing compressed MyISAM files
myisam/myisamchk.c:
  Fix bug when repairing compressed MyISAM files
myisam/myisamdef.h:
  Fix bug when repairing compressed MyISAM files
mysql-test/r/func_group.result:
  Fix result for new RND function
mysql-test/r/func_math.result:
  Fix result for new RND function
mysql-test/r/func_str.result:
  test of new locate()
mysql-test/t/func_str.test:
  test of new locate()
sql/item_func.cc:
  LOCATE() is now case sensitive
sql/sql_string.cc:
  LOCATE() is now case sensitive
sql/sql_string.h:
  LOCATE() is now case sensitive
2001-11-22 13:50:50 +02:00
unknown
1bdd19639d bad merge fixed 2001-11-21 19:58:25 +01:00
unknown
5975e23649 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
2001-11-21 15:39:01 +02:00
unknown
62d2ecb170 tests added
mysql-test/r/fulltext_distinct.result:
  boolean test added
mysql-test/t/fulltext_distinct.test:
  boolean test added
mysql-test/r/fulltext_left_join.result:
  boolean test added
mysql-test/t/fulltext_left_join.test:
  boolean test added
2001-11-20 17:58:00 +01:00
unknown
079f110a4a fixed problem in rpl_log test
mysql-test/fix-result:
  updated version
mysql-test/r/rpl_log.result:
  fixed result to be portable
2001-11-19 12:03:30 -07:00
unknown
c9e2debfe3 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-11-18 14:34:52 +02:00
unknown
21259d25f3 Test of optimize table.
Docs/manual.texi:
  Updated changelog.
  Update info about MERGE tables.
  Moved section 'Why so many open tables'
mysql-test/r/create.result:
  Added test of types in CREATE
mysql-test/t/create.test:
  Added test of types in CREATE
sql/item_func.cc:
  More different values for RAND(nr) and RAND(nr+1)
2001-11-18 14:13:09 +02:00
unknown
640fadf2f8 work to enable reading 3.23 logs - not yet finished
moved fail-safe replication routines from sql_repl.cc to repl_failsafe.cc
write start event only in the first log


client/mysqlbinlog.cc:
  work to enable reading 3.23 logs
libmysql/Makefile.shared:
  added mf_iocache2 to libmysqlclient - needed for mysqlbinlog
mysql-test/mysql-test-run.sh:
  added --start-and-exit
mysql-test/r/rpl000002.result:
  result clean-up
mysql-test/r/rpl000016.result:
  result update
mysql-test/r/rpl_log.result:
  result update
mysql-test/t/rpl000016.test:
  test cleanup
mysys/mf_iocache.c:
  fixed new bug
sql/log.cc:
  write start event only on server start or after reset master
sql/log_event.cc:
  work to enable reading 3.23 log format
sql/log_event.h:
  work to enable reading 3.23 format
sql/repl_failsafe.cc:
  code restructuring
sql/repl_failsafe.h:
  re-organized code
sql/slave.cc:
  check master version
sql/slave.h:
  old_format member
sql/sql_class.h:
  allow user to specify io cache type
  need_start_event member to allow writing start event only in the first log
sql/sql_parse.cc:
  code re-organization
sql/sql_repl.cc:
  code reorganization
sql/sql_repl.h:
  reorganized code
2001-11-10 22:24:12 -07:00
unknown
30052a4901 Fixed bug in UPDATE .. ORDER BY
Docs/manual.texi:
  Changelog
mysql-test/r/update.result:
  Test found bug in UPDATE .. ORDER BY
mysql-test/t/update.test:
  Test found bug in UPDATE .. ORDER BY
2001-11-08 22:30:27 +02:00
unknown
897e7453d6 Don't use IGNORE by default in INSERT ... SELECT
Docs/manual.texi:
  Changelog
mysql-test/r/insert_select.result:
  Add testcase for INSERT IGNORE
mysql-test/t/insert_select.test:
  Add testcase for INSERT IGNORE
2001-11-08 14:17:56 +02:00
unknown
356003a8c9 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
myisam/ft_boolean_search.c:
  Auto merged
2001-11-08 01:33:46 +02:00
unknown
7e6161287e bug in relevance calculation fixed 2001-11-08 00:06:07 +01:00
unknown
8c02fad253 Fix wrong memory allocation in SHOW OPEN TABLES
BUILD/compile-alpha-cxx:
  Fix for Alpha ccc
configure.in:
  Remove not used libraries
mysql-test/r/innodb.result:
  Fix test case
sql/sql_base.cc:
  Fix wrong memory allocation in SHOW OPEN TABLES.
2001-11-08 00:43:27 +02:00
unknown
30f8c66722 Merge
myisam/ft_boolean_search.c:
  SCCS merged
2001-11-06 16:43:47 +01:00
unknown
9e29bb4e01 ft boolean search by table scan; queue_fix()
include/queues.h:
  queue_fix() introduced
myisam/ft_boolean_search.c:
  ft boolean search by table scan
myisam/ft_parser.c:
  ft boolean search by table scan
myisam/ft_update.c:
  ft boolean search by table scan
myisam/ftdefs.h:
  ft boolean search by table scan
mysql-test/r/fulltext_cache.result:
  ft boolean search by table scan
mysql-test/t/fulltext_cache.test:
  ft boolean search by table scan
mysys/queues.c:
  queue_fix() introduced
2001-11-06 16:17:31 +01:00
unknown
28d20a1d2f Make ft_xxx variables ulong to not break mysqld.cc init of variables.
mysqltest: replace_result now also affects error messages


client/mysqltest.c:
  replace_result now also affects error messages
include/ft_global.h:
  Make variables ulong to not break mysqld.cc init of variables.
myisam/ft_static.c:
  Make variables ulong to not break mysqld.cc init of variables.
mysql-test/r/join.result:
  Fix for 64 bit systems
mysql-test/t/join.test:
  Fix for 64 bit systems
2001-11-05 03:43:00 +02:00
unknown
d18a6cc33a Fixes up things after merge from 3.23.44
Portability fixes.
Don't delete temporary tables on FLUSH tables.


client/client_priv.h:
  Fix after merge
client/mysqldump.c:
  Fix after merge
include/my_global.h:
  Change CMP -> CMP_NUM because CMP was used in other places
include/violite.h:
  Added missing prototype
myisam/ft_boolean_search.c:
  Removed warnings
myisam/ft_nlq_search.c:
  Removed warnings
myisam/mi_search.c:
  CMP -> CMP_NUM
mysql-test/mysql-test-run.sh:
  Write all logs to log directory
mysql-test/r/func_time.result:
  Fix test results after merge
mysql-test/r/having.result:
  Fix test results after merge
mysql-test/r/join.result:
  Fix test results after merge
mysql-test/r/rpl000012.result:
  Fix test results after merge
mysys/mf_iocache.c:
  Allow multiple call to end_iocache.
sql/ha_innobase.cc:
  Removed possible problem with using uninitialized variable
sql/log_event.cc:
  Don't delete temporary tables on FLUSH tables.
  (Needs to be fixed properly)
2001-11-05 01:04:08 +02:00
unknown
cec36f0f14 use local version when doing merge with 3.23.44 2001-11-04 16:14:57 +02:00
unknown
0d1ba873aa merge with 3.23.44
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
include/my_base.h:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/rpl000012.test:
  Auto merged
BUILD/FINISH.sh:
  Auto merged
BitKeeper/deleted/.del-db_ext.h~a1e210bbd0de0a48:
  Auto merged
BitKeeper/deleted/.del-mutex_ext.h~f20f47ddc346598b:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
Build-tools/Do-all-build-steps:
  Auto merged
client/client_priv.h:
  Auto merged
client/mysqladmin.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/univ.i:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/rpl000015-slave.sh:
  Auto merged
mysql-test/t/rpl000016-slave.sh:
  Auto merged
mysys/mf_cache.c:
  Auto merged
mysys/mf_casecnv.c:
  Auto merged
mysys/mf_tempfile.c:
  Auto merged
readline/vi_mode.c:
  Auto merged
strings/strto.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/time.cc:
  Auto merged
BUILD/SETUP.sh:
  Use -mcpu as default (safe for all x86 cpu's)
client/mysqldump.c:
  Merge from 3.23.44
configure.in:
  Update version number
extra/resolveip.c:
  Portability fix
2001-11-04 16:14:09 +02:00
unknown
9f90ff3f12 Fix error messages
mysqltest now also writes failed error messages to log


Docs/manual.texi:
  Applied changes missed in last merge
client/mysqltest.c:
  Write failed error messages to log.
  Remove space from start of line when doing 'eval'
mysql-test/include/master-slave.inc:
  Fixed after adding output of error messages to mysqltest
mysql-test/r/alter_table.result:
  Removed wrong space
mysql-test/r/rpl000001.result:
  Removed wrong space
mysql-test/r/rpl000003.result:
  Fixed after adding output of error messages to mysqltest
mysql-test/r/rpl000015.result:
  Removed wrong space
mysql-test/r/rpl000016.result:
  Removed wrong space
mysql-test/t/drop.test:
  Change error numbers
mysql-test/t/union.test:
  Change error numbers
sql/share/czech/errmsg.txt:
  Fix error messages
sql/share/danish/errmsg.txt:
  Fix error messages
sql/share/english/errmsg.txt:
  Fix error messages
sql/share/french/errmsg.txt:
  Fix error messages
sql/share/german/errmsg.txt:
  Fix error messages
sql/share/greek/errmsg.txt:
  Fix error messages
sql/share/hungarian/errmsg.txt:
  Fix error messages
sql/share/italian/errmsg.txt:
  Fix error messages
sql/share/japanese/errmsg.txt:
  Fix error messages
sql/share/korean/errmsg.txt:
  Fix error messages
sql/share/norwegian-ny/errmsg.txt:
  Fix error messages
sql/share/norwegian/errmsg.txt:
  Fix error messages
sql/share/polish/errmsg.txt:
  Fix error messages
sql/share/portuguese/errmsg.txt:
  Fix error messages
sql/share/romanian/errmsg.txt:
  Fix error messages
sql/share/slovak/errmsg.txt:
  Fix error messages
sql/share/spanish/errmsg.txt:
  Fix error messages
sql/share/swedish/errmsg.txt:
  Fix error messages
sql/share/ukrainian/errmsg.txt:
  Fix error messages
2001-11-04 15:43:41 +02:00
unknown
29bae7b7b7 merge
BitKeeper/etc/logging_ok:
  auto-union
acinclude.m4:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
Docs/manual.texi:
  Bad merge.
include/mysqld_error.h:
  Merge with 3.23
2001-11-03 22:28:16 +02:00
unknown
0176dacd54 Fixed problem with t1 LEFT_JOIN t2 ... WHERE t2.date_column IS NULL when date_column is declared as NOT NULL.
BUILD/SETUP.sh:
  Use -O1 to avoid problem with INLINE functions
Docs/manual.texi:
  Changelog
mysql-test/r/join.result:
  Test for bugfix
mysql-test/t/join.test:
  Test for bugfix
sql/sql_select.cc:
  Fixed problem with t1 LEFT_JOIN t2 ... WHERE t2.date_column IS NULL when date_column was declared as NOT NULL.
BitKeeper/etc/ignore:
  Added bdb/include/db_ext.h bdb/include/mutex_ext.h to the ignore list
2001-11-03 21:22:06 +02:00
unknown
b2cec26dfb Fix that mysqladmin shutdown can be interrupted with ^C
Fixed bug with BLOB keys in BDB tables
Fixed problem with MERGE tables on OS with 32 bit files
Fixed that TIME_TO_SEC() works with negative times


Docs/manual.texi:
  Changelog
client/mysqladmin.c:
  Fix that mysqladmin shutdown can be interrupted with ^C
include/mysqld_error.h:
  Fixed typo
mysql-test/r/func_time.result:
  Added test case for negative times
mysql-test/t/func_time.test:
  Added test case for negative times
mysql-test/t/rpl000015-slave.sh:
  Removed warnings
mysql-test/t/rpl000016-slave.sh:
  Removed warnings
sql/field.cc:
  Fixed bug with BLOB keys in BDB tables
sql/field.h:
  Fixed bug with BLOB keys in BDB tables
sql/ha_berkeley.cc:
  Fixed bug with BLOB keys in BDB tables
sql/ha_myisammrg.cc:
  Fixed problem with MERGE tables on OS with 32 bit files
sql/item_timefunc.cc:
  Fixed that TIME_TO_SEC() works with negative times.
sql/share/swedish/errmsg.txt:
  Merge with 4.0
sql/sql_acl.cc:
  Fixed typo
2001-11-03 15:18:09 +02:00
unknown
03f6fdd575 Portability fixes
Fix for consistent 0000-00-00 date handling
Close + open binary logs on flush tables
Fix for AVG() in HAVING.


BUILD/SETUP.sh:
  Compile MySQL with -O0 to make debugging easier.
Docs/manual.texi:
  Changelog
configure.in:
  Version change
innobase/buf/buf0lru.c:
  Fix for windows
mysql-test/r/func_time.result:
  Updated tests
mysql-test/r/having.result:
  Updated tests
mysql-test/t/func_time.test:
  Updated tests
mysql-test/t/having.test:
  Updated tests
mysys/mf_casecnv.c:
  Portability fix
mysys/mf_qsort.c:
  Portability fix
mysys/my_compress.c:
  Portability fix
mysys/my_tempnam.c:
  More comments
sql/field.cc:
  Fix for consistent 0000-00-00 date handling
sql/item.h:
  Fix for AVG() in HAVING
sql/log.cc:
  Close + open update logs on flush tables
sql/sql_select.cc:
  More debugging info
sql/time.cc:
  Fix for consistent 0000-00-00 date handling
strings/ctype.c:
  Portability fix
strings/strto.c:
  Portability fix
2001-10-31 18:27:49 +02:00
unknown
b3a974963d Fixed error message when opening a not-MyISAM file.
Extended MODIFY and CHANGE in ALTER TABLE to accept the AFTER keyword.
Extended MyISAM to handle records > 16M.


Docs/manual.texi:
  Updated state of different modules.
  Rewrote description of 'perror' and 'Packet too large'.
myisam/mi_dynrec.c:
  Extended MyISAM to handle records > 16M
myisam/mi_open.c:
  Fix error message when opening a not-MyISAM file.
myisam/myisamdef.h:
  Extended MyISAM to handle records > 16M
mysql-test/r/alter_table.result:
  Added test for CHANGE col ... AFTER
mysql-test/t/alter_table.test:
  Added test for CHANGE col ... AFTER
sql/sql_table.cc:
  Extended MODIFY and CHANGE in ALTER TABLE to accept the AFTER keyword.
sql/sql_yacc.yy:
  Extended MODIFY and CHANGE in ALTER TABLE to accept the AFTER keyword.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-10-29 10:49:35 +02:00
unknown
368c6c1f30 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-10-25 08:58:01 -06:00
unknown
47ce1631b5 remove hard-coded directory from test result in rpl000001
mysql-test/r/rpl000001.result:
  make the test "sasha-independent"
mysql-test/t/rpl000001.test:
  make the test "sasha-independent"
2001-10-25 08:57:11 -06:00
unknown
381007fa6a Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


sql/sql_yacc.yy:
  Auto merged
2001-10-25 14:50:50 +03:00
unknown
1c90833606 New alternate UNION syntax and bug fix for multi-table deletes
mysql-test/r/union.result:
  New results for optional UNION syntax
mysql-test/t/union.test:
  New  test for alternate syntax for UNION
sql/sql_delete.cc:
  Fixed bug in multi-table delete's with transactional tables
sql/sql_parse.cc:
  A small change to enable new UNION syntax
sql/sql_union.cc:
  New alternate UNION syntax
sql/sql_yacc.yy:
  New alternate UNION syntax
2001-10-25 14:41:49 +03:00
unknown
3bd0819a91 merge of lost change
mysql-test/r/keywords.result:
  merged lost change back
2001-10-24 11:52:19 -06:00
unknown
aba008d6b3 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-10-23 13:28:47 -06:00
unknown
8fc78e08b0 cleanup
removal of duplicate code in mf_iocache.cc 
work on failsafe replication
work on SEQ_READ_APPEND io cache


include/my_sys.h:
  updates for SEQ_READ_APPEND
libmysql/Makefile.am:
  fix for mysys/mf_iocache.c
libmysql/libmysql.c:
  updates for new format of SHOW SLAVE HOSTS
mysql-test/r/rpl000001.result:
  test replication of LOAD DATA LOCAL INFILE
mysql-test/r/rpl000002.result:
  updated test result
mysql-test/t/rpl000001.test:
  test LOAD DATA LOCAL INFILE
mysys/mf_iocache.c:
  cleanup to remove duplicate functionality
  some work on SEQ_READ_APPEND
sql/mf_iocache.cc:
  cleanup to remove duplicate functionality
sql/repl_failsafe.cc:
  more work on failsafe replication
sql/repl_failsafe.h:
  more work on failsafe replication
sql/slave.cc:
  cleanup
  more work on failsafe replication
sql/sql_load.cc:
  fixed bug on replicating empty file loads
  got LOAD DATA LOCAL INFILE to work again, and to be replicated
sql/sql_repl.cc:
  cleanup
  more work on failsafe replication
sql/sql_repl.h:
  more work on failsafe replication
2001-10-23 13:28:03 -06:00
unknown
d0ea7a53c9 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/item_func.h:
  Auto merged
2001-10-22 11:57:48 +02:00
unknown
b09eb95869 two bugs in ft_update
myisam/ft_update.c:
  two bugfixes
mysql-test/r/fulltext.result:
  new tests
mysql-test/t/fulltext.test:
  new tests
2001-10-20 16:37:26 +02:00
unknown
440de598ee Update test results after merge
mysql-test/r/join_outer.result:
  Update test results
mysql-test/r/null.result:
  Update test results
2001-10-20 11:56:49 +03:00
unknown
253b9ecb11 Don't use signal() on windows.
Added missing InnoDB variables to SHOW VARIABLES.
Fixed bug when doing WHERE 'column_name=NULL' on an indexed column that had NULL values.
Fixed bug when doing 'LEFT JOIN ...  ON (column_name = constant) WHERE column_name = constant'


Docs/manual.texi:
  Changelog
libmysql/libmysql.c:
  Don't use signal() on windows.
mysql-test/r/join_outer.result:
  Test for bugfix
mysql-test/r/null.result:
  Test for bugfix
mysql-test/t/join_outer.test:
  Test for bugfix
mysql-test/t/null.test:
  Test for bugfix
sql/mysqld.cc:
  Add missing InnoDB variables to SHOW VARIABLES.
sql/sql_select.cc:
  Fixed bug when doing WHERE 'column_name=NULL' on an indexed column that had NULL values.
  Fixed bug when doing 'LEFT JOIN ...  ON (column_name = constant) WHERE column_name = constant'
2001-10-19 22:10:54 +03:00
unknown
83ba8a138f typo fixed
mysql-test/r/fulltext.result:
  new test
mysql-test/t/fulltext.test:
  new test
2001-10-17 14:49:54 +02:00
unknown
b28bfc7a26 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/t/join.test:
  Auto merged
2001-10-13 09:29:32 -06:00
unknown
5c1dbfe6a7 64-bit portability fixes in network I/O
use $MAX_TABLES mysqltest variable to make join test portable
make test now works with the manager on IA64 Linux


client/mysqltest.c:
  added MAX_TABLES variable
libmysql/libmysql.c:
  portability fixes for 64-bit systems
mysql-test/mysql-test-run.sh:
  fixed bug - wrong values of -display in xterm in gdb mode
mysql-test/r/join.result:
  make test work on both 32-bit and 64-bit systems
mysql-test/t/join.test:
  make test work on both 32-bit and 64-bit systems
sql/mini_client.cc:
  64-bit portability fixes
sql/mini_client.h:
  64-bit portability fixes
sql/slave.cc:
  64-bit portability fixes
tools/mysqlmanager.c:
  64-bit portability fixes
2001-10-13 09:28:35 -06:00
unknown
0c2d19b5b5 mysql-test/r/fulltext*.result updated
mysql-test/r/fulltext_cache.result:
  fixed
mysql-test/r/fulltext_left_join.result:
  fixed
mysql-test/r/fulltext_multi.result:
  fixed
mysql-test/r/fulltext_order_by.result:
  fixed
2001-10-12 19:10:11 +02:00
unknown
6db2120514 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/fulltext_order_by.result:
  Auto merged
mysql-test/r/fulltext_multi.result:
  Auto merged
mysql-test/r/fulltext_cache.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/r/fulltext_left_join.result:
  Auto merged
sql/handler.h:
  Auto merged
2001-10-12 17:47:13 +02:00
unknown
d34950e8d2 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


mysql-test/r/rpl_failsafe.result:
  Auto merged
mysql-test/t/rpl_failsafe.test:
  Auto merged
mysql-test/t/rpl000018.test:
  Auto merged
2001-10-11 13:55:29 -06:00
unknown
56303b0383 fixes for mysql-test to run without manager
a bit more work on failsafe replication


client/mysqltest.c:
  added require_manager support
mysql-test/mysql-test-run.sh:
  added --no-manager
mysql-test/r/rpl_failsafe.result:
  updated result
mysql-test/t/rpl000018.test:
  must have manager
mysql-test/t/rpl_failsafe.test:
  must have manager
sql/repl_failsafe.cc:
  more work
sql/repl_failsafe.h:
  more work
sql/slave.cc:
  update replication status for fail-safe replication on different events
2001-10-11 13:54:06 -06:00
unknown
239e8da926 Merge serg.mysql.com:/usr/home/serg/Abk/mysql-4.0-newft
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2001-10-11 18:47:22 +02:00
unknown
54f02d3263 misc. fulltext staff
myisam/ft_boolean_search.c:
  Fixed bug
mysql-test/r/fulltext.result:
  updated for new mysqltest
mysql-test/t/fulltext.test:
  duplicate removed
2001-10-11 18:46:35 +02:00