Commit graph

13774 commits

Author SHA1 Message Date
unknown
4b294ccdd3 - Fixed a previous modification to the MySQL Startup Item for
Mac OS X: the name of the startup script itself must match the
   name of the subdirectory it's located in. Changed MySQL->MySQLCOM 
   in the Do-pkg script and renamed the file in BK. (Thanks to Bryan
   McCormack for reporting this)


Build-tools/Do-pkg:
   - renamed script from MySQL to MySQLCOM to match the name of the
     directory it's installed in
support-files/MacOSX/MySQLCOM:
   - Fixed the file and directory name to match the actual location
2004-07-13 22:11:33 +02:00
unknown
5eb3dc3223 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-07-13 21:50:09 +02:00
unknown
d2415e8188 - Move checking of the MD5 checksumming to the correct place
- fix calling of my_md5sum
2004-07-13 21:03:30 +02:00
unknown
3c4c978ca4 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-07-13 16:51:59 +02:00
unknown
6221e0decc WL#1900 "When CHECK TABLE or ANALYZE TABLE of a MyISAM table is killed
by KILL or shutdown, do not mark the table as corrupted".
It is indeed more logical to leave the corruption flag unchanged.
This cannot be extended to REPAIR/OPTIMIZE as they make no backup copy
of the MYI. This patch was tested with KILL and mysqladmin shutdown
while a CHECK TABLE was running. Without the patch, the table becomes
unusable (can't INSERT to it, error 145). With the patch, no.


sql/ha_myisam.cc:
  When CHECK TABLE or ANALYZE TABLE is killed by KILL,
  do not mark the table corrupted; leave its corruption flag
  unchanged.
2004-07-13 16:51:10 +02:00
unknown
9870801123 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/j/mysql-4.0
2004-07-13 15:28:29 +03:00
unknown
f1d8676c2d - fixed tabbing and added several missing symbols (required for
linking with PHP5) (thanks to Georg Richter for the patch)
2004-07-13 13:50:06 +02:00
unknown
1e23a0efef A fix for a long standing bug in LOAD DATA .. LOCAL ..'
sql/sql_load.cc:
  A fix for a long standing bug in LOAD DATA .. LOCAL ..'
  
  When the error occurs, a link is broken instead of simply returning
  the error message and maintaining the same connection.
2004-07-13 13:54:20 +03:00
unknown
7ee050590f lock0lock.c:
Decrement n_lock_table_exp in lock_table_remove_low()
  instead of lock_table_dequeue().
  Do not empty lock_heap in lock_release_tables_off_kernel().


innobase/lock/lock0lock.c:
  Decrement n_lock_table_exp in lock_table_remove_low()
  instead of lock_table_dequeue().
  Do not empty lock_heap in lock_release_tables_off_kernel().
2004-07-13 12:30:34 +03:00
unknown
e1ee41175c Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-13 09:39:22 +02:00
unknown
c3f0e4fc71 forced X/Open mode on HPUX removed. The correct way (that affects not only C but also C++ and linking) would be
CFLAGS="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_HPUX_SOURCE"
CXXFLAGS="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_HPUX_SOURCE"
LDFLAGS="-lxnet"

but apparently MySQL works without too.
2004-07-13 09:37:16 +02:00
unknown
10d5b7715b s/help all/help contents/
bug#4527
2004-07-13 08:57:55 +02:00
unknown
63c915c7b9 InnoDB: LOCK TABLES clean-up, part 2
innobase/lock/lock0lock.c:
  Decrement n_lock_table_exp in lock_table_dequeue(), not elsewhere
2004-07-12 17:14:13 +03:00
unknown
fbc420ba0e InnoDB: LOCK TABLE clean-up
innobase/include/lock0lock.h:
  Improve comments regarding LOCK_TABLE_EXP
innobase/include/row0mysql.h:
  Rename row_unlock_table_for_mysql() to row_unlock_tables_for_mysql()
  and improve its comment
innobase/include/trx0trx.h:
  Rename n_tables_locked to n_lock_table_exp
innobase/lock/lock0lock.c:
  Rename n_tables_locked to n_lock_table_exp
  Increment n_lock_table_exp already in lock_table_create()
  Replace some ut_ad() assertions with ut_a()
innobase/row/row0mysql.c:
  Rename n_tables_locked to n_lock_table_exp
  Rename row_unlock_table_for_mysql() to row_unlock_tables_for_mysql()
  and improve its comment
innobase/trx/trx0trx.c:
  Rename n_tables_locked to n_lock_table_exp
sql/ha_innodb.cc:
  Rename n_tables_locked to n_lock_table_exp
  Rename row_unlock_table_for_mysql() to row_unlock_tables_for_mysql()
2004-07-12 16:47:22 +03:00
unknown
7b6fc58fff InnoDB: Increment the lock wait watchdog timeout during CHECK TABLE
(Bug #2694)


innobase/include/srv0srv.h:
  Add srv_fatal_semaphore_wait_threshold
innobase/include/sync0arr.h:
  Improve comment of sync_array_print_long_waits()
innobase/row/row0mysql.c:
  Lengthen the srv_fatal_semaphore_wait_threshold by 2 hours during
  CHECK TABLE
innobase/srv/srv0srv.c:
  Add srv_fatal_semaphore_wait_threshold
innobase/sync/sync0arr.c:
  Improve comment of sync_array_print_long_waits().
  Replace the fixed timeout of 600 seconds with
  srv_fatal_semaphore_wait_threshold.
2004-07-12 15:13:18 +03:00
unknown
45485da702 srv0start.c:
innobase_start_or_create_for_mysql(): Rename innodb.status.<pid>
  to innodb_status.<pid> to avoid problems on VMS


innobase/srv/srv0start.c:
  innobase_start_or_create_for_mysql(): Rename innodb.status.<pid>
  to innodb_status.<pid> to avoid problems on VMS
2004-07-12 14:12:53 +03:00
unknown
18d974a3e7 Don't close already closed files in vio (not critical)
mysys/my_init.c:
  Extra debugging
sql/mysqld.cc:
  Added comment
sql/sql_parse.cc:
  Removed unneeded info
vio/viosocket.c:
  Added assert.
  Don't close already closed files
2004-07-12 07:38:46 +03:00
unknown
4ba63c4e8d Merge
sql/sql_show.cc:
  Auto merged
sql/mysql_priv.h:
  SCCS merged
2004-07-11 12:16:25 +03:00
unknown
9e38156bed wl1292
Try to remove rare timeouts by
Increased timeout in CpcClient and mgmapi


ndb/src/common/util/socket_io.cpp:
  Increased timeout in CpcClient and mgmapi
ndb/src/mgmclient/CpcClient.cpp:
  Increased timeout in CpcClient and mgmapi
2004-07-11 08:55:32 +02:00
unknown
1baac2a70c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-07-11 08:49:33 +02:00
unknown
98083dd6eb testSystemRestart -n SR1
Handle arbit during system shutdown


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Handle arbit during system shutdown
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Handle arbit during system shutdown
ndb/test/run-test/daily-basic-tests.txt:
  Moved testOIBasix + testSystemRestart -n SR1/SR2
  to basic tests
ndb/test/run-test/daily-devel-tests.txt:
  Moved testOIBasix + testSystemRestart -n SR1/SR2
  to basic tests
2004-07-11 08:49:01 +02:00
unknown
f7fdf06271 Reorder variables to preserve alphabetical sorting. 2004-07-10 15:21:44 +04:00
unknown
f4b2b7aa2d mysql_find_files() made extern (from static to sql_show.cc) 2004-07-10 11:13:05 +02:00
unknown
d3b4458367 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-07-10 11:01:33 +02:00
unknown
c8e416e5c5 manual merge
charged sql/sql_db.cc only
(
changed length in mysql_create_db to path_len
so as it was calculated in the first unpack_dirname
in my previous fix for Bug #4378
'"create database IF NOT EXISTS thing" returns an error'
)


sql/sql_db.cc:
  manual merge 
  (
  changed length in mysql_create_db to path_len
  so as it was calculated in the first unpack_dirname
  in my previous fix for Bug #4378
  '"create database IF NOT EXISTS thing" returns an error'
  )
2004-07-09 21:06:32 +05:00
unknown
42d5ea8e78 added an optimization in mysql_create_db (sql_db.cc)
as after effect of fix for Bug #4378 
'"create database IF NOT EXISTS thing" returns an error' 

(avoided an unpack_dirname and 
 changed strcat into strmake)


sql/sql_db.cc:
  added an optimization in mysql_create_db 
  (avoided an unpack_dirname and 
   changed strcat into strmake)
2004-07-09 20:39:50 +05:00
unknown
fd595190f9 Irix64 mipspro ndb compile fixes 2004-07-09 15:10:24 +02:00
unknown
2b1233c38d mysqlhotcopy:
fix MYI copying with scp
  safer tempfile creation


scripts/mysqlhotcopy.sh:
  fix MYI copying with scp
  safer tempfile creation
2004-07-09 14:30:51 +02:00
unknown
6e5eda0314 Irix64 mipspro ndb compile fixes 2004-07-09 13:28:52 +02:00
unknown
24f137a8fd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-07-09 13:21:22 +02:00
unknown
1cbbbcf70e Fixed bug #4106 and removed buggy pk update 2004-07-09 13:18:56 +02:00
unknown
e119be8646 Merge o2k.irixworld.net:/usr/people/mysqldev/jonas/my41
into o2k.irixworld.net:/usr/people/mysqldev/jonas/tmp


ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
2004-07-09 12:50:22 +02:00
unknown
01aceaaa15 Irix64 mipspro ndb compile fixes
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-07-09 12:48:32 +02:00
unknown
f3d2f05c7f Merge joreland@bk-internal.mysql.com:irix
into mysql.com:/home/jonas/src/mysql-4.1
2004-07-09 12:09:49 +02:00
unknown
0785d204f7 Removed some macros
and moved some code.
Improve portability


ndb/include/kernel/signaldata/SignalData.hpp:
  Removed macros
ndb/include/mgmcommon/MgmtErrorReporter.hpp:
  Removed macros
ndb/include/util/Bitmask.hpp:
  Removed macros
ndb/src/common/debugger/SignalLoggerManager.cpp:
  Moved printSegmented to src/kernel/vm
ndb/src/kernel/Main.cpp:
  Removed macros
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Removed macros
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Removed macros
ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  Removed macros
ndb/src/kernel/blocks/ndbfs/Pool.hpp:
  Removed macros
ndb/src/kernel/error/ErrorReporter.hpp:
  Removed macros
ndb/src/kernel/vm/MetaData.cpp:
  Removed macros
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Removed macros
ndb/src/kernel/vm/SimulatedBlock.hpp:
  Removed macros
ndb/src/kernel/vm/TransporterCallback.cpp:
  Moved printSegmented to src/kernel/vm
ndb/src/mgmclient/CommandInterpreter.cpp:
  Removed macros
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Removed macros
ndb/src/ndbapi/TransporterFacade.cpp:
  Removed macros
2004-07-09 10:00:09 +02:00
unknown
a4b3eec910 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-07-09 10:55:47 +03:00
unknown
b42209774a Cleanup of db option cacheing
Some bug fixes to last pushed code


mysql-test/mysql-test-run.sh:
  Fix for new valgrind (2.1.1)
mysql-test/r/bdb.result:
  Updated results
mysql-test/t/ps_1general.test:
  removed wrong error condition
sql/ha_berkeley.cc:
  Fix for index_flags() in new code
sql/item_strfunc.cc:
  Cleanup (fixed indentation, removed short variable names)
sql/mysql_priv.h:
  Cleanup of db option cacheing
sql/mysqld.cc:
  Cleanup of db option cacheing
sql/sql_db.cc:
  Cleanup of db option cacheing
sql/sql_parse.cc:
  Cleanup of db option cacheing
sql/sql_table.cc:
  sprintf -> strxmov
sql/table.cc:
  key_read should be tested on key parts, not the whole key
2004-07-09 10:55:16 +03:00
unknown
53ca595451 Merge with 4.0 to get bug fixes
Build-tools/Bootstrap:
  Auto merged
Build-tools/Do-compile:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
mysql-test/r/system_mysql_db_refs.result:
  Auto merged
mysql-test/t/system_mysql_db_fix-master.opt:
  Auto merged
mysql-test/t/system_mysql_db.test:
  Auto merged
2004-07-09 02:29:28 +03:00
unknown
ee9890162e Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-07-09 02:03:50 +03:00
unknown
da4f3b371a Updated result sets (from 4.1) 2004-07-09 02:03:19 +03:00
unknown
544f52f11c Bug fix for testOIBasic
ndb/src/ndbapi/Ndbif.cpp:
  Allow SCANTAB_CONF wo/ waiting for them,
  but only reset thewaitstate when actually waiting
2004-07-09 00:46:49 +02:00
unknown
6e18271f1c my_global.h:
Define cxa_pure_virtual to print error message and DBUG_ASSERT:
  calls to pure virtual methods should not go unnoticed.


include/my_global.h:
  Define cxa_pure_virtual to print error message and DBUG_ASSERT:
  calls to pure virtual methods should not go unnoticed.
2004-07-09 01:35:35 +04:00
unknown
39d6bdfb73 Do-compile:
Call my_md5sum with path


Build-tools/Do-compile:
  Call my_md5sum with path
2004-07-08 16:16:37 -05:00
unknown
4acc0869c4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0
2004-07-08 14:06:30 -05:00
unknown
9c7e5eddca Merge here.mwagner.org:/Volumes/BK/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0-work
2004-07-08 13:52:46 -05:00
unknown
8fe328f3a6 Do-compile:
Added support for MD5 verification of file transfers


Build-tools/Do-compile:
  Added support for MD5 verification of file transfers
2004-07-08 13:51:18 -05:00
unknown
7a30ad7152 fixed Bug #4378 "create database IF NOT EXISTS thing" returns an error
sql/sql_db.cc:
  discarded final '\' in path for my_stat (for Win32)
  as the fix 
  for Bug #4378 "create database IF NOT EXISTS thing" returns an error
2004-07-08 21:25:17 +05:00
unknown
85c57e7048 Fixed Bug#4451. According to C/C++ standards, enums should not be used
out of their range.
2004-07-08 17:12:42 +03:00
unknown
27dc52fa02 Bug#4338: mysql-test-run fails if compiled with non-latin1 character set 2004-07-08 18:54:07 +05:00
unknown
661b8165ec Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_db.cc:
  Auto merged
2004-07-08 15:45:56 +03:00