Commit graph

13424 commits

Author SHA1 Message Date
unknown
9864327a61 ha_ndb blobs 2004-07-22 12:33:14 +02:00
unknown
149b70dc57 Removed timeout tests 2004-07-19 10:31:55 +02:00
unknown
d590b04708 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb


mysql-test/mysql-test-run.sh:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-07-19 09:09:40 +02:00
unknown
be922a58e9 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1


sql/item_subselect.cc:
  Auto merged
2004-07-17 02:13:02 +03:00
unknown
b13efa54a1 test fix 2004-07-17 02:09:25 +03:00
unknown
910131fd23 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-07-17 01:08:25 +03:00
unknown
1fd2fdfa49 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1
2004-07-16 15:47:28 +03:00
unknown
2c6a2b5306 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-07-16 15:45:06 +03:00
unknown
296796e376 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1
2004-07-16 15:40:05 +03:00
unknown
be0e166f53 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-16 13:33:57 +02:00
unknown
0d07df3d8d in 4.1 DATABASE() may be NULL 2004-07-16 13:21:58 +02:00
unknown
6a7ecbb707 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-07-15 21:36:17 +02:00
unknown
8871b054fe Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-07-15 21:19:16 +02:00
unknown
c2753d95ee - Avoid the error message "Can't read index header from..."
when copying a small index file because the value returned
   for $length is < 1024. This can happen if the filehandle
   was open()ed as an UTF-8 encoded file with Unicode characters
   (In this case read() returns characters not bytes)
   (Thanks to Mike Bethune) for this hint)
2004-07-15 21:18:31 +02:00
unknown
3d8c7c3dd9 check that all system tables deleted added 2004-07-15 14:17:30 +03:00
unknown
bde7d0932c stack overflow check added for subqueries processing (BUG#4554)
sql/item_subselect.cc:
  stack overflow check added for subqueries processing
2004-07-14 23:57:14 +03:00
unknown
dd01a13a5b mysql_fix_privilege_tables.sh:
Language fixups.


scripts/mysql_fix_privilege_tables.sh:
  Language fixups.
2004-07-14 11:33:00 -05:00
unknown
8f97c1232d - fixed file name of the MySQL startup item script to MySQLCOM,
so it's included in the source distribution
2004-07-14 09:10:49 +02:00
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
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
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
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
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
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
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
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