Commit graph

462 commits

Author SHA1 Message Date
unknown
7927e83e4c Merge
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/mysqld.cc:
  SCCS merged
2001-05-23 22:52:21 +02:00
unknown
f68e5ce76a Merge heikki@work.mysql.com:/home/my/mysql
into donna.mysql.fi:/home/heikki/mysqle


BitKeeper/etc/logging_ok:
  auto-union
2001-05-23 19:43:16 +03:00
unknown
a4abfe6a47 manual.texi Add links for downloadable menagerie db distribution
Docs/manual.texi:
  Add links for downloadable menagerie db distribution
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-23 10:18:51 -05:00
unknown
2f8dfb3f4a srv0srv.h One can now specify innodb_unix_file_flush_method in my.cnf
srv0srv.c	One can now specify innodb_unix_file_flush_method in my.cnf
srv0start.c	One can now specify innodb_unix_file_flush_method in my.cnf
ha_innobase.cc	One can now specify innodb_unix_file_flush_method in my.cnf
ha_innobase.h	One can now specify innodb_unix_file_flush_method in my.cnf
mysqld.cc	One can now specify innodb_unix_file_flush_method in my.cnf


sql/ha_innobase.cc:
  One can now specify innodb_unix_file_flush_method in my.cnf
sql/ha_innobase.h:
  One can now specify innodb_unix_file_flush_method in my.cnf
sql/mysqld.cc:
  One can now specify innodb_unix_file_flush_method in my.cnf
innobase/srv/srv0srv.c:
  One can now specify innodb_unix_file_flush_method in my.cnf
innobase/srv/srv0start.c:
  One can now specify innodb_unix_file_flush_method in my.cnf
innobase/include/srv0srv.h:
  One can now specify innodb_unix_file_flush_method in my.cnf
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-23 18:04:49 +03:00
unknown
359733fa00 merge
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-23 02:40:22 +03:00
unknown
28b812212d Merge jamppa@work:/home/bk/mysql
into janikt.pp.saunalahti.fi:/home/my/bk/mysql


BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
2001-05-23 02:40:21 +03:00
unknown
36b93f91db Updated documentation of how to add new native functions.
Small cleanups


Docs/manual.texi:
  Updated how to add new native functions
mysql-test/r/func_crypt.result:
  Fix for crypt on FreeBSD
mysql-test/t/func_crypt.test:
  Fix for crypt on FreeBSD
mysys/thr_lock.c:
  Changed to use statistics_increment macro for statistic variables.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-23 02:30:17 +03:00
unknown
46ea783d2e Added a link.
Docs/manual.texi:
  Added a link to a GUI.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-23 00:00:42 +03:00
unknown
369401d172 Merge work.mysql.com:/home/bk/mysql-4.0
into x3.internalnet:/home/tonu/bk/mysql-4.0-modified


BitKeeper/etc/logging_ok:
  auto-union
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-05-20 20:41:49 +02:00
unknown
209e37a77f Makefile.am openssl support
missing:
  openssl support
sql/Makefile.am:
  openssl support
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-20 20:32:49 +02:00
unknown
8b02ffbaf1 .del-violite.c~984c09cffe14a11b Delete: libmysql/violite.c
acconfig.h	openssl support
acinclude.m4	openssl support


acinclude.m4:
  openssl support
acconfig.h:
  openssl support
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Delete: libmysql/violite.c
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-20 20:11:11 +02:00
unknown
0fc76938a1 .del-vio-global.h~c261412c01b2f4 Delete: vio/vio-global.h
.del-viotypes.h~f5a38e7326bd50f3	Delete: vio/viotypes.h
.del-violite.h~58d2942a52ea7a83	Delete: vio/violite.h
.del-VioSSLFactoriesFd.h~1d63ae149a63f85	Delete: vio/VioSSLFactoriesFd.h
.del-VioPipe.cc~12cf83b9a2f48f6c	Delete: vio/VioPipe.cc
.del-VioSSLAcceptorFd.cc~4c828f3688ed74ec	Delete: vio/VioSSLAcceptorFd.cc
.del-VioSSL.cc~6e85340b11fa42a8	Delete: vio/VioSSL.cc
.del-VioSSLFactoriesFd.cc~89f6bf5073937947	Delete: vio/VioSSLFactoriesFd.cc
.del-vioelitexx.cc~3eaba70da792a7fc	Delete: vio/vioelitexx.cc
.del-version.cc~7237acf12bed4a97	Delete: vio/version.cc
.del-VioSocket.cc~71c615783f29b5e1	Delete: vio/VioSocket.cc
.del-VioSSL.h~70d367b7ec8cac3e	Delete: vio/VioSSL.h
.del-VioPipe.h~21cebbe61a1da546	Delete: vio/VioPipe.h
.del-VioFd.h~8294293a88c7b4b8	Delete: vio/VioFd.h
.del-VioFd.cc~6e444647affef63b	Delete: vio/VioFd.cc
.del-VioConnectorFd.h~58bc11cdc885b951	Delete: vio/VioConnectorFd.h
.del-VioAcceptorFd.cc~a5a08947a31f88de	Delete: vio/VioAcceptorFd.cc
.del-VioConnectorFd.cc~ddbd7821c43c83a2	Delete: vio/VioConnectorFd.cc
.del-VioAcceptorFd.h~7f9c4358477ba9a3	Delete: vio/VioAcceptorFd.h
.del-Vio.cc~60737ce02ab2bc25	Delete: vio/Vio.cc
.del-Vio.h~f4416b2949647602	Delete: vio/Vio.h
.del-VioSocket.h~a26d535bd5a1a6	Delete: vio/VioSocket.h


BitKeeper/deleted/.del-VioSocket.h~a26d535bd5a1a6:
  Delete: vio/VioSocket.h
BitKeeper/deleted/.del-Vio.cc~60737ce02ab2bc25:
  Delete: vio/Vio.cc
BitKeeper/deleted/.del-Vio.h~f4416b2949647602:
  Delete: vio/Vio.h
BitKeeper/deleted/.del-VioAcceptorFd.cc~a5a08947a31f88de:
  Delete: vio/VioAcceptorFd.cc
BitKeeper/deleted/.del-VioAcceptorFd.h~7f9c4358477ba9a3:
  Delete: vio/VioAcceptorFd.h
BitKeeper/deleted/.del-VioConnectorFd.cc~ddbd7821c43c83a2:
  Delete: vio/VioConnectorFd.cc
BitKeeper/deleted/.del-VioConnectorFd.h~58bc11cdc885b951:
  Delete: vio/VioConnectorFd.h
BitKeeper/deleted/.del-VioFd.cc~6e444647affef63b:
  Delete: vio/VioFd.cc
BitKeeper/deleted/.del-VioFd.h~8294293a88c7b4b8:
  Delete: vio/VioFd.h
BitKeeper/deleted/.del-VioPipe.h~21cebbe61a1da546:
  Delete: vio/VioPipe.h
BitKeeper/deleted/.del-VioSSL.h~70d367b7ec8cac3e:
  Delete: vio/VioSSL.h
BitKeeper/deleted/.del-VioSSLFactoriesFd.cc~89f6bf5073937947:
  Delete: vio/VioSSLFactoriesFd.cc
BitKeeper/deleted/.del-VioSocket.cc~71c615783f29b5e1:
  Delete: vio/VioSocket.cc
BitKeeper/deleted/.del-version.cc~7237acf12bed4a97:
  Delete: vio/version.cc
BitKeeper/deleted/.del-vioelitexx.cc~3eaba70da792a7fc:
  Delete: vio/vioelitexx.cc
BitKeeper/deleted/.del-VioPipe.cc~12cf83b9a2f48f6c:
  Delete: vio/VioPipe.cc
BitKeeper/deleted/.del-VioSSL.cc~6e85340b11fa42a8:
  Delete: vio/VioSSL.cc
BitKeeper/deleted/.del-VioSSLAcceptorFd.cc~4c828f3688ed74ec:
  Delete: vio/VioSSLAcceptorFd.cc
BitKeeper/deleted/.del-VioSSLFactoriesFd.h~1d63ae149a63f85:
  Delete: vio/VioSSLFactoriesFd.h
BitKeeper/deleted/.del-vio-global.h~c261412c01b2f4:
  Delete: vio/vio-global.h
BitKeeper/deleted/.del-violite.h~58d2942a52ea7a83:
  Delete: vio/violite.h
BitKeeper/deleted/.del-viotypes.h~f5a38e7326bd50f3:
  Delete: vio/viotypes.h
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-20 14:04:06 +02:00
unknown
17fbf163c0 merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
myisam/mi_search.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
2001-05-20 12:38:19 +02:00
unknown
112ad67205 merge
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-19 10:17:47 +03:00
unknown
d20ee4bfc1 manual.texi more development tree section changes
manual.texi	change "InnoDB consinsten read" to
manual.texi	"InnoDB consistent read" in @node lines
manual.texi	(to match section's actual title)
manual.texi	cleanups to "installing from development source
manual.texi	tree" section


Docs/manual.texi:
  more development tree section changes
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-18 23:05:33 -05:00
unknown
f194e4e0ed ibuf0ibuf.c Insert buffer calculated SQL NULL size wrong, causing overflow and assertion failure in some cases
log0log.c	Retrieve a dummy value from a function to prevent gcc crashing on HP-UX


innobase/log/log0log.c:
  Retrieve a dummy value from a function to prevent gcc crashing on HP-UX
innobase/ibuf/ibuf0ibuf.c:
  Insert buffer calculated SQL NULL size wrong, causing overflow and assertion failure in some cases
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-18 21:20:03 +03:00
unknown
62198cbc79 Merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
2001-05-18 18:49:30 +02:00
unknown
ada14881c7 Do-patch-file Fix typo (extra 'mv')
ignore  	added Logs/* binary/*


BitKeeper/etc/ignore:
  added Logs/* binary/*
Build-tools/Do-patch-file:
  Fix typo (extra 'mv')
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-18 18:48:38 +02:00
unknown
93eefe46b5 Merge work.mysql.com:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/3


Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-18 12:45:03 -04:00
unknown
a91cc1d0e7 manual.texi Added a mirror, adjusted some URLs.
Docs/manual.texi:
  Added a mirror, adjusted some URLs.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-17 13:59:52 -05:00
unknown
aa07f65cae Merge work.mysql.com:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/3


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_select.cc:
  Auto merged
2001-05-14 14:23:45 -04:00
unknown
9192600eb7 Merged with 3.23, needs further fix-up
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
include/myisam.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
  Auto merged
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
  Auto merged
client/mysqltest.c:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
Docs/manual.texi:
  merged
client/errmsg.c:
  merged
configure.in:
  merged
sql/mysqld.cc:
  merged
sql/sql_select.cc:
  merged, needs manual fixing
sql/sql_yacc.yy:
  merged, needs manual fixing
2001-05-10 15:06:35 -06:00
unknown
68edfdd667 Several minor fixes to manual per Tom.
Docs/manual.texi:
  Several minor fixes per Tom.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-02 05:49:59 -05:00
unknown
449c819b44 manual.texi fixed paragraph
Docs/manual.texi:
  fixed paragraph
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-01 04:12:23 -04:00
unknown
915c00a416 manual.texi missing @ on @item in contributed software page
Docs/manual.texi:
  missing @ on @item in contributed software page
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-23 09:07:51 -05:00
unknown
d6cac4dde1 Merge jamppa@work:/home/bk/mysql into hynda.mysql.fi:/data/my/bk/mysql
BitKeeper/etc/logging_ok:
  auto-union
2001-04-20 01:12:58 +03:00
unknown
682067f493 New client, mysqlcheck, for MySQL. mysqlcheck should be used for
CHECK, REPAIR, ANALYZE and OPTIMIZE instead of myisamchk, when
MySQL server is running. Documentation to MySQL manual will follow
shortly.


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-20 01:12:10 +03:00
unknown
1115a79126 Merge work.mysql.com:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/work


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_select.cc:
  Auto merged
2001-04-19 15:15:34 -04:00
unknown
7337a193b1 Merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/sql_select.cc:
  Auto merged
Docs/manual.texi:
  SCCS merged
sql/Makefile.am:
  SCCS merged
2001-04-19 00:58:30 +02:00
unknown
09518126f1 Update for MySQL-Max
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-18 16:35:30 +02:00
unknown
5028127133 os0thread.c Change pthread_yield to sched_yield
univ.i  	Change pthread_yield to sched_yield
configure.in	Change pthread_yield to sched_yield


innobase/configure.in:
  Change pthread_yield to sched_yield
innobase/include/univ.i:
  Change pthread_yield to sched_yield
innobase/os/os0thread.c:
  Change pthread_yield to sched_yield
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-18 17:23:06 +03:00
unknown
efe87b85f0 Small fixes to manual.texi.
Docs/manual.texi:
  Small fixes.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-17 14:57:31 -05:00
unknown
b0e8ab1931 Merge
BitKeeper/etc/logging_ok:
  auto-union
sql/sql_select.cc:
  SCCS merged
2001-04-17 09:18:37 -04:00
unknown
b279170bf3 sql_select.cc sizeof(**TABLE) -> sizeof(*TABLE) in malloc()
sql/sql_select.cc:
  sizeof(**TABLE) -> sizeof(*TABLE) in malloc()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-17 09:13:10 -04:00
unknown
1a3e335580 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-17 14:17:48 +02:00
unknown
391b984926 Updated manual
Docs/manual.texi:
  Did a minor addition to the OS recommendation section.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-17 02:00:46 +03:00
unknown
2cd409e32b Docs/manual.texi
Added a stern warning in a visible (in my opinion) place to make sure
    to compile with -fno-exceptions when using gcc
    Wrote a new paragraphs on OS comparison/choice in the Which OS section



Docs/manual.texi:
  Added a stern warning in a visible (in my opinion) place to make sure
  to compile with -fno-exceptions when using gcc
  Wrote a new paragraphs on OS comparison/choice in the Which OS section
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-16 15:15:59 -06:00
unknown
4b570fc359 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
2001-04-15 20:16:51 +02:00
unknown
46decdde43 Merge
BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  SCCS merged
2001-04-14 09:38:43 -04:00
unknown
15742ff343 mysql-test-run.sh don't depend on 'tr'
mysql-test/mysql-test-run.sh:
  use IFS=: instead of tr : " "
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-14 09:35:42 -04:00
unknown
5128e3750d merged
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/sql_delete.cc:
  Auto merged
2001-04-13 21:16:53 +02:00
unknown
5821746067 manually merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-13 16:31:53 +02:00
unknown
00b254969d log0recv.c Change Innobase text to InnoDB
log0log.c	Change Innobase text to InnoDB
srv0start.c	Change Innobase text to InnoDB
srv0srv.c	Change Innobase text to InnoDB
ha_innobase.cc	Change Innobase text to InnoDB


sql/ha_innobase.cc:
  Change Innobase text to InnoDB
innobase/srv/srv0srv.c:
  Change Innobase text to InnoDB
innobase/srv/srv0start.c:
  Change Innobase text to InnoDB
innobase/log/log0log.c:
  Change Innobase text to InnoDB
innobase/log/log0recv.c:
  Change Innobase text to InnoDB
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-13 16:36:54 +03:00
unknown
0948956b80 Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-13 12:39:34 +03:00
unknown
ab0338a398 manual.texi Fix Bowser's birth date (1998 -> 1989)
Docs/manual.texi:
  Fix Bowser's birth date (1998 -> 1989)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-12 18:54:37 -05:00
unknown
71af8ca9bf Ugly merge of 3.23 changes into 4.0 - fix up needed
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
myisam/mi_search.c:
  the ugliest merge I've ever done! And I already see this has introduced a bug - will have to do a fix-up afterwards
2001-04-11 19:09:00 -06:00
unknown
d6ca0213b0 merge
BitKeeper/etc/logging_ok:
  auto-union
2001-04-11 16:49:40 -06:00
unknown
72ccee9d37 fixed bugs in the new stuff in rpl000001 test
start slave thread if master.info is present and server_id is set
updates for rpl000015 and rpl000016 to remove master.info to make sure
master info struct does not get auto-initialized


Docs/manual.texi:
  updates for recent changes
mysql-test/r/rpl000001.result:
  update for test case change
mysql-test/t/rpl000001.test:
  fixed bugs in the test case
mysql-test/t/rpl000015.test:
  wrong change - to be reversed
sql/mysqld.cc:
  start slave thread if master.info is present and server_id is set
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-11 16:29:15 -06:00
unknown
e9d687674b Fixed bug when using a key on a CHAR(255) NULL column
Docs/manual.texi:
  New links
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-12 00:56:55 +03:00
unknown
f21a521981 os0file.c Change pwrite to os_file_pwrite to allow compilation if no pwrite
innobase/os/os0file.c:
  Change pwrite to os_file_pwrite to allow compilation if no pwrite
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-11 21:47:51 +03:00