Commit graph

708 commits

Author SHA1 Message Date
unknown
c698629458 manual.texi minor wording change in LOAD DATA section
Docs/manual.texi:
  minor wording change in LOAD DATA section
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-12 17:27:36 -06:00
unknown
2ce474dc65 test case for a coredump on merge tables. Sergei or Monty, can you fix this?
mysql-test/mysql-test-run:
  added support for copying tables into datadir - now only MRG and FRM
  files are copied - will add others as we come up with samples
2000-12-12 08:24:50 -07:00
unknown
6d8a5e9088 Merge
sql/filesort.cc:
  merged
2000-12-12 13:30:07 +01:00
unknown
5902b26a86 ft0000001.test more tests added
ft0000002.test  several ft-indexes test
filesort.cc	DBUG_PRINT's added


sql/filesort.cc:
  more DBUG_PRINT's added
mysql-test/t/ft0000001.test:
  more tests added
2000-12-12 13:17:29 +01:00
unknown
28ad76e22c Fixed delete in tables with hidden primary key
Remove not used BDB logs on shutdown
Don't give warnings for repair on slaves
Fixed transaction log files


Docs/manual.texi:
  Updated 'known bugs'
include/my_sys.h:
  Added define for checking number of bytes left in the IO_CACHE
mysql-test/mysql-test-run:
  Small bug fixes
mysys/mf_iocache2.c:
  Use new define
sql/filesort.cc:
  Temporary fix for FULLTEXT index
sql/ha_berkeley.cc:
  Fix for delete in tables with hidden primary key
  Remove not used BDB logs on shutdown
sql/ha_myisam.cc:
  Don't give warnings for repair on slaves
sql/hostname.cc:
  Portability fix
sql/log.cc:
  Fix transaction log files
sql/log_event.h:
  portability fix
sql/slave.cc:
  Don't give warnings for repair on slaves
sql/sql_class.h:
  Cleanup
sql/sql_parse.cc:
  Fixed typo
2000-12-12 04:34:56 +02:00
unknown
7847639270 log_event.h fixed load data infile replication for alpha
sql/log_event.h:
  fixed load data infile replication for alpha
2000-12-11 14:22:48 -07:00
unknown
695c8120e1 sql/sql_repl.cc
last fix in send_file() was wrong


sql/sql_repl.cc:
  last fix in send_file() was wrong
2000-12-11 13:09:01 -07:00
unknown
7429b2e1e8 I hope I've fixed all the bugs by now, let's test it
sql/log_event.h:
  changed new/delete for Log_event to use my_malloc/my_free
sql/mysql_priv.h:
  wait for slave to get going
sql/mysqld.cc:
  wait for slave to get going in SLAVE START
sql/slave.cc:
  fixed more memory leaks
sql/sql_repl.cc:
  file name was not being \0 terminated in send_file
2000-12-11 12:06:34 -07:00
unknown
5d6b2d0d35 Merge 2000-12-11 14:30:57 +01:00
unknown
c369c42772 sel000032.test backpropagated from mysql-4.0
sel000031.test	backpropagated from mysql-4.0
sel000014.result	backpropagated from mysql-4.0
sel000006.test	s|r/3.23/|r/|
sel000007.test	s|r/3.23/|r/|
sel000008.test	s|r/3.23/|r/|
sel000009.test	s|r/3.23/|r/|
sel000010.test	s|r/3.23/|r/|
sel000011.test	s|r/3.23/|r/|
sel000012.test	s|r/3.23/|r/|
sel000013.test	s|r/3.23/|r/|
sel000014.test	s|r/3.23/|r/|
sel000015.test	s|r/3.23/|r/|
sel000016.test	s|r/3.23/|r/|
sel000017.test	s|r/3.23/|r/|
sel000018.test	s|r/3.23/|r/|
sel000019.test	s|r/3.23/|r/|
sel000020.test	s|r/3.23/|r/|
sel000021.test	s|r/3.23/|r/|
sel000022.test	s|r/3.23/|r/|
sel000023.test	s|r/3.23/|r/|
sel000024.test	s|r/3.23/|r/|
sel000025.test	s|r/3.23/|r/|
sel000026.test	s|r/3.23/|r/|
sel000027.test	s|r/3.23/|r/|
sel000028.test	s|r/3.23/|r/|
sel000029.test	s|r/3.23/|r/|
sel000030.test	s|r/3.23/|r/|
sel000033.test	s|r/3.23/|r/|
sel000005.test	s|r/3.23/|r/|
ft0000001.test	s|r/3.23/|r/|
sel000004.test	s|r/3.23/|r/|


mysql-test/t/sel000004.test:
  s|r/3.23/|r/|
mysql-test/t/ft0000001.test:
  s|r/3.23/|r/|
mysql-test/t/sel000005.test:
  s|r/3.23/|r/|
mysql-test/t/sel000006.test:
  s|r/3.23/|r/|
mysql-test/t/sel000007.test:
  s|r/3.23/|r/|
mysql-test/t/sel000008.test:
  s|r/3.23/|r/|
mysql-test/t/sel000009.test:
  s|r/3.23/|r/|
mysql-test/t/sel000010.test:
  s|r/3.23/|r/|
mysql-test/t/sel000011.test:
  s|r/3.23/|r/|
mysql-test/t/sel000012.test:
  s|r/3.23/|r/|
mysql-test/t/sel000013.test:
  s|r/3.23/|r/|
mysql-test/t/sel000014.test:
  s|r/3.23/|r/|
mysql-test/t/sel000015.test:
  s|r/3.23/|r/|
mysql-test/t/sel000016.test:
  s|r/3.23/|r/|
mysql-test/t/sel000017.test:
  s|r/3.23/|r/|
mysql-test/t/sel000018.test:
  s|r/3.23/|r/|
mysql-test/t/sel000019.test:
  s|r/3.23/|r/|
mysql-test/t/sel000020.test:
  s|r/3.23/|r/|
mysql-test/t/sel000021.test:
  s|r/3.23/|r/|
mysql-test/t/sel000022.test:
  s|r/3.23/|r/|
mysql-test/t/sel000023.test:
  s|r/3.23/|r/|
mysql-test/t/sel000024.test:
  s|r/3.23/|r/|
mysql-test/t/sel000025.test:
  s|r/3.23/|r/|
mysql-test/t/sel000026.test:
  s|r/3.23/|r/|
mysql-test/t/sel000027.test:
  s|r/3.23/|r/|
mysql-test/t/sel000028.test:
  s|r/3.23/|r/|
mysql-test/t/sel000029.test:
  s|r/3.23/|r/|
mysql-test/t/sel000030.test:
  s|r/3.23/|r/|
mysql-test/t/sel000033.test:
  s|r/3.23/|r/|
mysql-test/r/sel000014.result:
  backpropagated from mysql-4.0
mysql-test/t/sel000031.test:
  backpropagated from mysql-4.0
mysql-test/t/sel000032.test:
  backpropagated from mysql-4.0
2000-12-11 14:23:00 +01:00
unknown
4c6a415233 Tests backpropagated from mysql-4.0 bk tree
mysql-test/t/sel000004.test:
  backpropagated from mysql-4.0
mysql-test/t/sel000005.test:
  backpropagated from mysql-4.0
mysql-test/r/sel000004.result:
  backpropagated from mysql-4.0
mysql-test/r/sel000005.result:
  backpropagated from mysql-4.0
2000-12-11 14:09:31 +01:00
unknown
011f8d0a7d Removed init that crashed BDB
Fixed newly introduced bug in update


BitKeeper/etc/ignore:
  Added libmysql_r/conf_to_src to the ignore list
sql/filesort.cc:
  Removed init that crashed BDB
sql/ha_berkeley.cc:
  Fixed bug in sub AUTO_INCREMENT keys in BDB tables
sql/opt_range.cc:
  Cleanup
sql/sql_update.cc:
  Fixed newly introduced bug in update
2000-12-11 02:31:09 +02:00
unknown
71c02e7646 Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
Docs/manual.texi:
  Auto merged
2000-12-10 21:12:12 +02:00
unknown
b6f2308795 Bugfix when using a multi-part unique key in the SET and WHERE part
Put PRIMARY KEY and UNIQUE keys before other keys
Fixes for auto_increment keys for BDB tables


Docs/manual.texi:
  Changelog
sql/ha_berkeley.cc:
  Fixes for auto_increment keys
sql/sql_table.cc:
  Put PRIMARY KEY and UNIQUE keys before other keys
sql/sql_update.cc:
  Bugfix when using a multi-part unique key in the SET and WHERE part
2000-12-10 21:10:03 +02:00
unknown
8beb43501b fixed up leaks found by --exit-info=256
better error diagnostic in SLAVE START


sql/mini_client.cc:
  if we fail to connect, we need to free the inited structure
sql/mysqld.cc:
  added end_slave() for slave cleanup
sql/slave.cc:
  fixed serveral memory leaks
sql/slave.h:
  added end_master_info() for clean up
sql/sql_class.cc:
  not changed
sql/sql_repl.cc:
  initialize master info before creating slave thread in SLAVE START -
  this way we can easily send an error to the client if something is 
  wrong in init_master_info
2000-12-09 14:28:51 -07:00
unknown
701af10414 Docs/manual.texi
updates for the test suite
Docs/Support/test-make-manual
    abort with a message if a utility fails
    open the manual in a browser on success 


Docs/manual.texi:
  updates for the test suite
Docs/Support/test-make-manual:
  abort with a message if a utility fails
  open the manual in a browser on success
2000-12-09 09:30:54 -07:00
unknown
2e927c7d19 logs were not being called with exiting set to true on server exit
sql/mysqld.cc:
  added proper close to logs on server exit
2000-12-08 21:01:36 -07:00
unknown
95c34725a7 Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


mysql-test/mysql-test-run:
  Auto merged
2000-12-08 17:44:45 -07:00
unknown
6a095ea533 mysql-test/mysql-test-run
reversed gcov to work the old way - the worst thing that can happen 
    if slave and master execute the same code at the same time is that
    we get a lesser  count on the code branch execution, but in any case,
    it will be at least counted once, which is really all we care.
    
    Besides, the source tracking is most likely not thread safe, but this
    is ok for the same reason.


mysql-test/mysql-test-run:
  reversed gcov to work the old way - the worst thing that can happen 
  if slave and master execute the same code at the same time is that
  we get a lesser  count on the code branch execution, but in any case,
  it will be at least counted once, which is really all we care.
  
  Besides, the source tracking is most likely not thread safe, but this
  is ok for the same reason.
2000-12-08 17:32:30 -07:00
unknown
0b18dbf858 ignore cleaned up, AGAIN!
myrg_open.c	delayed queue allocation


myisammrg/myrg_open.c:
  delayed queue allocation
BitKeeper/etc/ignore:
  cleaned up, AGAIN!
2000-12-09 00:41:06 +01:00
unknown
de7a86dec5 Merge 2000-12-09 00:36:22 +01:00
unknown
c44e8d7a70 mysql-test-run --core-file changed to --exit-info=256
it's yet another mysqld hidden feature
                --exit-info=256 is like --core-file but prints info at exit.
                --exit-info itself implies also one-thread (undocumented)


mysql-test/mysql-test-run:
  --core-file changed to --exit-info=256
  it's yet another mysqld hidden feature
  --exit-info=256 is like --core-file but prints 
  info at exit.
  --exit-info itself implies also one-thread (undocumented)
2000-12-08 23:14:37 +01:00
unknown
1ab28e5ea9 sql/mysqld.cc
fixed auto set of server id
sql/sql_repl.cc
    do not allow slave to replicate if master id was not supplied
sql/sql_repl.h
    fix for server_id


sql/mysqld.cc:
  fixed auto set of server id
sql/sql_repl.cc:
  do not allow slave to replicate if master id was not supplied
sql/sql_repl.h:
  fix for server_id
2000-12-08 12:50:57 -07:00
unknown
776bd0e418 mysqldump.c typo fixed
mysqldumpslow.sh   | first line should be #!@PERL@
mysqld_multi.sh    | not #@perl@ or #!/usr/bin/perl


client/mysqldump.c:
  typo fixed
2000-12-08 19:12:12 +01:00
unknown
56c1e86d2d Merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  SCCS merged
2000-12-08 18:39:37 +02:00
unknown
19d406d937 Lots of fixes for BDB tables
Change DROP TABLE to first drop the data, then the .frm file


Docs/manual.texi:
  Updated TODO and Changelog
include/Makefile.am:
  Portability fix
mysql-test/misc/select.res:
  ***MISSING WEAVE***
mysys/mf_iocache2.c:
  cleanup
scripts/mysqlhotcopy.sh:
  Fixed --noindices
sql-bench/Results/ATIS-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/RUN-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/alter-table-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/big-tables-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/connect-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/create-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/insert-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/select-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/wisconsin-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/limits/pg.cfg:
  Updated to new crash-me
sql-bench/server-cfg.sh:
  Fixes for pg 7.0.2
sql/ha_berkeley.cc:
  Lots of BDB table fixes
sql/ha_berkeley.h:
  Lots of BDB table fixes
sql/handler.cc:
  Change DROP TABLE to first drop the data, then the .frm file
sql/hostname.cc:
  Fixes for empty hostnames
sql/log.cc:
  Fixed transaction logging
sql/share/swedish/errmsg.OLD:
  cleanup
sql/sql_delete.cc:
  Fixes for logging
sql/sql_insert.cc:
  Fixes for logging
sql/sql_select.cc:
  Fixes for BDB tables
sql/sql_table.cc:
  Change DROP TABLE to first drop the data, then the .frm file
sql/sql_update.cc:
  Fixes for logging
BitKeeper/etc/ignore:
  Added scripts/mysqld_multi to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-08 17:04:57 +02:00
unknown
bef71c9a0f Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-12-08 07:11:45 -07:00
unknown
464471ae75 fixed bug in load data infile replication
updated test suite to always test if slave obeys stop/start commands 


mysql-test/include/master-slave.inc:
  test if the slave actually stops and starts in response to slave start/slave stop
sql/log_event.cc:
  call the right constructor - I am 99% sure this is what cause sporadic failures of rpl000001
sql/share/romanian/errmsg.sys:
  not changed
2000-12-08 07:11:22 -07:00
unknown
9c8afb1f82 mrg000001.result Change mode to -rw-rw-r--
mrg000001.dummy.result	Change mode to -rw-rw-r--


mysql-test/r/mrg000001.dummy.result:
  Change mode to -rw-rw-r--
mysql-test/r/mrg000001.result:
  Change mode to -rw-rw-r--
2000-12-08 14:25:45 +01:00
unknown
5d3584a306 Merge
BitKeeper/etc/gone:
  auto-merge
BitKeeper/etc/ignore:
  merged, cleaned up
2000-12-08 14:00:48 +01:00
unknown
63c64ac950 sql_base.cc merge+insert (v.3)
myrg_info.c	merge+insert (v.3)
myrg_extra.c	merge+insert (v.3)
ignore  	cleanup


BitKeeper/etc/ignore:
  cleanup
myisammrg/myrg_extra.c:
  merge+insert (v.3)
myisammrg/myrg_info.c:
  merge+insert (v.3)
sql/sql_base.cc:
  merge+insert (v.3)
2000-12-08 13:53:24 +01:00
unknown
3a62f018f3 Small changes in mysqld_multi.
scripts/mysqld_multi.sh:
  Small changes and bug fixes.
2000-12-08 14:35:54 +02:00
unknown
f643a700a3 Added documentation.
Docs/manual.texi:
  Added documentation about running multiple MySQL servers.
2000-12-08 14:18:08 +02:00
unknown
417f8c3fde Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Auto converge
2000-12-07 21:53:35 -07:00
unknown
4d3f79265b more cleanup of slave load data infile - trying to track down bug,
BitKeeper/etc/ignore:
  Added BitKeeper/tmp/applied.list BitKeeper/tmp/backup.list BitKeeper/tmp/backup.sfio BitKeeper/tmp/sfile.list to the ignore list
sql/slave.cc:
  log warnings from replicated load data infile
sql/sql_load.cc:
  do not log load data infile from the master to update log on the slave
2000-12-07 21:51:29 -07:00
unknown
1324803d76 Temporary fix for handling wild_one at end of string (key compression).
Full fix shall be in MySQL 4.1. (This is a hard one (!))


sql/opt_range.cc:
  Temporary fix for handling wild_one at end of string (key compression).
  A full fix shall be somewhere in 4.1 (!) This is a hard one...
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-08 00:34:16 +02:00
unknown
bbc25ae694 rpl000001 sporadic failure mystery solved - the table was being opened twice :-)
BitKeeper/etc/ignore:
  Added mysql-test/var/slave-data/mysql-bin.001 mysql-test/var/slave-data/mysql-bin.002 mysql-test/var/slave-data/mysql-bin.003 mysql-test/var/slave-data/mysql-bin.004 mysql-test/var/slave-data/mysql-bin.005 mysql-test/var/slave-data/mysql-bin.006 mysql-test/var/slave-data/mysql-bin.007 mysql-test/var/slave-data/mysql-bin.008 mysql-test/var/slave-data/mysql-bin.009 mysql-test/var/slave-data/mysql-bin.010 mysql-test/var/slave-data/mysql-bin.011 mysql-test/var/slave-data/mysql-bin.012 mysql-test/var/slave-data/mysql-bin.013 mysql-test/var/slave-data/mysql-bin.014 mysql-test/var/slave-data/mysql-bin.index to the ignore list
mysql-test/mysql-test-run:
  re-added --log-bin --log-slave updates to slave startup options
sql/slave.cc:
  fixed bug in LOAD DATA INFILE replication
2000-12-07 11:40:22 -07:00
unknown
8a61d51105 mysql-test/Makefile.am
removed extra files, adjusted for renames


mysql-test/Makefile.am:
  removed extra files, adjusted for renames
2000-12-07 10:30:37 -07:00
unknown
47d7fe9e38 Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
2000-12-07 10:23:17 -07:00
unknown
9ae7f931ce Do-all-build-steps added --without-berkeley-db
Build-tools/Do-all-build-steps:
  added --without-berkeley-db
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-07 18:22:11 +01:00
unknown
4b262c5daf Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-12-07 10:15:02 -07:00
unknown
4512b01c31 ok, here comes the push - prepare to resolve conflicts! And lets hope bk can gracefully handle all of my renames
BitKeeper/etc/ignore:
  Added mysql-test/var/lib/test/test3.frm mysql-test/var/lib/test/test3.MRG to the ignore list
mysql-test/t/mrg000001.test:
  fixed paths
sql/log.cc:
  fixed mutex problem
2000-12-07 10:14:28 -07:00
unknown
7836013784 Added documentation about the mysql client. 2000-12-07 18:04:08 +02:00
unknown
3e9523d2fa make -j 2
BUILD/compile-pentium-gcov:
  use second CPU
BUILD/compile-pentium:
  I got my second CPU
Build-tools/Do-all-build-steps:
  use second CPU
Build-tools/Do-compile:
  use second CPU
2000-12-07 08:38:46 -07:00
unknown
8f4a153320 mrg000001.dummy.result Rename: mysql-test/r/3.23/mrg000001.dummy.result -> mysql-test/r/mrg000001.dummy.result
mrg000001.result	Rename: mysql-test/r/3.23/mrg000001.result -> mysql-test/r/mrg000001.result
mrg000001.test	Rename: mysql-test/t/3.23/mrg000001.test -> mysql-test/t/mrg000001.test


mysql-test/t/mrg000001.test:
  Rename: mysql-test/t/3.23/mrg000001.test -> mysql-test/t/mrg000001.test
mysql-test/r/mrg000001.dummy.result:
  Rename: mysql-test/r/3.23/mrg000001.dummy.result -> mysql-test/r/mrg000001.dummy.result
mysql-test/r/mrg000001.result:
  Rename: mysql-test/r/3.23/mrg000001.result -> mysql-test/r/mrg000001.result
2000-12-07 08:24:18 -07:00
unknown
a768562aa3 Merge
BitKeeper/etc/logging_ok:
  Auto converge
configure.in:
  Auto merged
mysql-test/misc/select.res:
  ***MISSING WEAVE***
BitKeeper/etc/ignore:
  Added BitKeeper/etc/config BitKeeper/tmp/CONTENTS BitKeeper/tmp/patch BitKeeper/tmp/pid to the ignore list
mysql-test/mysql-test-run:
  merge
2000-12-07 08:10:30 -07:00
unknown
a61853544e stop chewing!
mysql-test/misc/mysql-test_V1.9.pl:
  mvdir
mysql-test/misc/select.res:
  ***MISSING WEAVE***
mysql-test/misc/select.tst:
  mvdir
2000-12-07 08:02:11 -07:00
unknown
593e443298 chew it!
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
2000-12-07 07:57:48 -07:00
unknown
0a8aef4105 chew on!
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
2000-12-07 07:57:04 -07:00
unknown
9779b0548d chew on this!
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
2000-12-07 07:56:30 -07:00