Commit graph

6347 commits

Author SHA1 Message Date
unknown
515ca2c4b4 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0
sql/mysqld.cc:
  Auto merged
2003-05-26 20:35:27 +03:00
unknown
cd554e9ed6 Fixed bug when installing mysqld as a service with 2 arguments (option + service-name) 2003-05-26 20:09:53 +03:00
unknown
6f8e0d1364 Fix for 64 bit machines (To remove warnings on Itanium)
mysys/thr_alarm.c:
  Safety fix
2003-05-26 19:11:22 +03:00
unknown
6fea1f3373 Merge with 3.23 to get fix for kill mysqld-pid
BitKeeper/etc/logging_ok:
  auto-union
include/mysql_com.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/ha_innodb.cc:
  Keep local copy
2003-05-26 17:55:49 +03:00
unknown
8ec9bd59ee Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-05-26 17:29:32 +03:00
unknown
1ed4e006bd Fixed problem with 'kill pid-of-mysqld' on Mac OS X 2003-05-26 17:24:16 +03:00
unknown
5dfc7130a8 Merge jani@192.168.0.2:/my/mysql-4.0
into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-05-26 15:50:05 +03:00
unknown
ecdd47a72f code cleanup
mysql-test/r/rpl_insert_id.result:
  Test logging of FOREIGN_KEY_CHECKS
mysql-test/t/rpl_insert_id.test:
  Test logging of FOREIGN_KEY_CHECKS
sql/log.cc:
  Code cleanup
2003-05-26 15:08:17 +03:00
unknown
a222789320 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


sql/log_event.cc:
  Auto merged
2003-05-26 13:36:43 +03:00
unknown
306b74fcc8 Fixed core dump bug when shuting down mysqld 2003-05-26 13:10:08 +03:00
unknown
e864f2592d Added testing of LOAD DATA ... STARTING BY
Added read_only variable


mysql-test/r/loaddata.result:
  Added testing of STARTING BY
mysql-test/t/loaddata.test:
  Added testing of STARTING BY
sql/log_event.cc:
  Code cleanup
sql/set_var.cc:
  Added read_only variable
sql/sql_update.cc:
  Remove not used variable
2003-05-26 11:47:03 +03:00
unknown
ea99087e88 Added missing free for last patch 2003-05-26 06:16:50 +03:00
unknown
3d6a2f475a Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-05-26 05:57:53 +03:00
unknown
069141f229 Remove not used flag 2003-05-26 05:57:27 +03:00
unknown
dc90f5ccd7 log.cc:
If FOREIGN_KEY_CHECKS=0, wrap in binlog SQL statements inside SET FOREIGN_...=0; ... ; SET FOREIGN_...=1


sql/log.cc:
  If FOREIGN_KEY_CHECKS=0, wrap in binlog SQL statements inside SET FOREIGN_...=0; ... ; SET FOREIGN_...=1
2003-05-25 23:37:32 +03:00
unknown
cceae0577b Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0


configure.in:
  Auto merged
2003-05-23 18:23:50 +02:00
unknown
4198322bef Outcome of discussions with Lenz and Monty about handling ccache in the build commands.
BUILD/SETUP.sh:
  Quote $CXX to make a test work even if CXX had spaces in it.
  Automatically add ccache to CC and CXX if ccache is present.
configure.in:
  Accept "ccache gcc" in the test.
2003-05-23 18:20:57 +02:00
unknown
7dcf24a3a4 Fix for #468 [Ver]: SHOW VARIABLES trims innodb_data_file_path
(this bug was already fixed in 4.0, I just copied and pasted two lines).
2003-05-23 16:40:21 +02:00
unknown
f985f468ef - Portability fix: FreeBSD 4.8-STABLE (480101) and 5.0-CURRENT (500110)
now have a thread safe realpath(3) implementation - added check to only
   define -DHAVE_BROKEN_REALPATH where required
   (thanks to Martin Blapp from the FreeBSD team for the patch)


configure.in:
   - FreeBSD 4.8-STABLE (480101) and 5.0-CURRENT (500110) now have a thread
     safe realpath(3) implementation - added check to only define
     -DHAVE_BROKEN_REALPATH where required
2003-05-23 11:38:37 +02:00
unknown
eb4755c90e row0ins.c:
Disable UNIQU KEY error reporting in SHOW INNODB STATUS until we know if it slows down REPLACE significantly


innobase/row/row0ins.c:
  Disable UNIQU KEY error reporting in SHOW INNODB STATUS until we know if it slows down REPLACE significantly
2003-05-22 00:05:33 +03:00
unknown
9f1da8ad49 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-3.23
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-3.23


BitKeeper/etc/logging_ok:
  auto-union
sql/log_event.cc:
  Auto merged
2003-05-21 15:18:30 -04:00
unknown
bddd75d28e fixed "LINES STARTING" in load data replication
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-05-21 15:16:56 -04:00
unknown
b76adc62fb repair_part2 is made repeatable 2003-05-21 21:58:12 +03:00
unknown
87a9e90fd0 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-4.0


sql/log_event.cc:
  Auto merged
2003-05-21 14:58:11 -04:00
unknown
530accbaae fixed 'STARTING BY' in replication
mysql-test/r/rpl_loaddata.result:
  added test for 'STARTING BY'
mysql-test/std_data/rpl_loaddata2.dat:
  added test for 'STARTING BY'
mysql-test/t/rpl_loaddata.test:
  added test for 'STARTING BY'
sql/log_event.cc:
  fixed 'STARTING BY'
2003-05-21 14:54:02 -04:00
unknown
32592ab8c1 - Tagged ChangeSet 1.1497 as "mysql-4.0.13"
- Updated version number in configure.in to 4.0.14 now that 4.0.13 has
   been tagged 


configure.in:
   - Updated version number to 4.0.14 now that 4.0.13 has been tagged
2003-05-19 16:36:50 +02:00
unknown
68aa31f268 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


sql/mysql_priv.h:
  Auto merged
2003-05-19 12:02:11 +03:00
unknown
18dd37b8a1 Added option --read-only (Thanks to Markus Benning)
myisam/myisamchk.c:
  Removed warning from fulltext when repairing many tables with fulltext index
sql/init.cc:
  Remove not used variables
sql/mysql_priv.h:
  Remove not used variables
sql/mysqld.cc:
  Removed not used variables
  Added option --read-only
  Change opt_do_pstack and master_ssl to get them to work with my_getopt
sql/set_var.cc:
  Option --read-only
sql/sql_parse.cc:
  Option --read-only
2003-05-19 12:01:38 +03:00
unknown
c2c0e70ffe srv0start.c:
Better instructions for the user if adding of new ibdata files fails


innobase/srv/srv0start.c:
  Better instructions for the user if adding of new ibdata files fails
2003-05-18 21:46:19 +03:00
unknown
bdf002d963 buf0buf.c:
When calculating the buf pool dirty pages ratio, add also free pages to the LRU list length: no need to active flushing if there are lots of free pages in the buffer pool


innobase/buf/buf0buf.c:
  When calculating the buf pool dirty pages ratio, add also free pages to the LRU list length: no need to active flushing if there are lots of free pages in the buffer pool
2003-05-17 16:23:46 +03:00
unknown
e4a95f2914 buf0lru.c, buf0flu.c, buf0buf.c, buf0lru.h:
Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
trx0trx.c:
  Add forgotten return value (it was not used anywhere, fortunately)
ha_innodb.h, mysql_priv.h:
  Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++


sql/mysql_priv.h:
  Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++
sql/ha_innodb.h:
  Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++
innobase/trx/trx0trx.c:
  Add forgotten return value (it was not used anywhere, fortunately)
innobase/include/buf0lru.h:
  Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
innobase/buf/buf0buf.c:
  Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
innobase/buf/buf0flu.c:
  Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
innobase/buf/buf0lru.c:
  Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
2003-05-16 16:27:50 +03:00
unknown
d57d45bb10 - re-enabled RAID support for the Max subpackage again 2003-05-16 13:36:13 +02:00
unknown
71df0f640a my_global.h:
- QNX 6.2.1 actually defines HAVE_RINT
  - fixed rint(A) #define as it was causing compile errors on QNX


include/my_global.h:
  - QNX 6.2.1 actually defines HAVE_RINT
  - fixed rint(A) #define as it was causing compile errors on QNX
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-05-16 13:03:47 +02:00
unknown
43d3714095 Portability fix for 64 bit machines 2003-05-14 23:06:06 +03:00
unknown
6ea284dc3f Merge with 3.23 (No releavant code changes)
acinclude.m4:
  Auto merged
configure.in:
  Merge with 3.23
innobase/os/os0sync.c:
  No change
sql/sql_show.cc:
  No change
2003-05-14 22:28:54 +03:00
unknown
4efbc40a13 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-14 22:13:20 +03:00
unknown
ac316cfdb3 Fixed bug in CREATE ... DECIMAL(-1,1). Bug #432
mysql-test/mysql-test-run.sh:
  Ensure that tests are sorted
mysql-test/r/type_decimal.result:
  Test for bug with decimal()
mysql-test/t/type_decimal.test:
  Test for bug with decimal()
sql/sql_parse.cc:
  Fixed bug in CREATE ... DECIMAL(-1,1)
2003-05-14 22:12:55 +03:00
unknown
3e52a3f1fc Portability fixes OpenUnix 8 & UnixWare 7.1.x 2003-05-14 22:08:30 +03:00
unknown
babb7ce9e1 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-05-14 22:06:11 +03:00
unknown
dbc5d0e109 os0sync.c:
Check return value of pthread_cond_...


innobase/os/os0sync.c:
  Check return value of pthread_cond_...
2003-05-14 20:22:55 +03:00
unknown
fb0d4064a7 os0sync.c:
Check that pthread_mutex_init and pthread_mutex_destroy return 0


innobase/os/os0sync.c:
  Check that pthread_mutex_init and pthread_mutex_destroy return 0
2003-05-14 20:17:01 +03:00
unknown
58d4f56928 os0sync.c:
Backport from 4.0: We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix


innobase/os/os0sync.c:
  Backport from 4.0: We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix
2003-05-14 19:09:05 +03:00
unknown
23d7a317ee os0sync.c:
We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix


innobase/os/os0sync.c:
  We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix
2003-05-14 19:00:17 +03:00
unknown
8b87a1aa0e Fixed a bug with having comments after options in config files.
Bug ID: 235
2003-05-14 16:47:55 +03:00
unknown
209e44c1a2 Fixed documentation for mysql_fix_privilege_tables man page.
Bug ID: 384
2003-05-14 13:49:43 +03:00
unknown
f527bc7fee SHOW TABLE STATUS displayed wrong Row_format for myisampack'ed tables. (Bug #427)
sql/sql_show.cc:
  SHOW TABLE STATUS displayed wrong Row_format for myisampack'ed tables.
2003-05-14 09:37:04 +03:00
unknown
7297502a7b Fix for checking global_access rights 2003-05-14 01:55:23 +03:00
unknown
bf75db781d Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


sql/sql_parse.cc:
  Auto merged
2003-05-14 01:28:59 +03:00
unknown
13a23a879f Fix for MacOSX and symlinks
Fix for USE_FRM and crashed index file


configure.in:
  Fix for MacOSX and symlinks
myisam/mi_open.c:
  Give better error message in case of of crashed index file
mysql-test/r/repair.result:
  new test case
mysql-test/r/update.result:
  new test case
mysql-test/t/repair.test:
  Added test with crashed MyISAM index header
mysql-test/t/update.test:
  Added test case from bugs system
sql/handler.cc:
  Indentation changes
sql/sql_table.cc:
  Fix for USE_FRM and crashed index file
2003-05-14 01:27:26 +03:00
unknown
8946eb3d50 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-05-13 23:03:33 +02:00