Commit graph

36396 commits

Author SHA1 Message Date
ingo/mydev@chilla.local
cf708395e9 After merge fix 2006-07-24 10:53:26 +02:00
ingo/mydev@chilla.local
8bb8069653 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.1-amerge
2006-07-24 10:05:17 +02:00
stewart@willster.(none)
dbaba24c5b BUG#20294 Instance manager test im_instance_conf fails randomly
(well, im_options in this case, but using existing bug report)
2006-07-24 09:38:42 +10:00
stewart@willster.(none)
1496303771 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/main
into  willster.(none):/home/stewart/Documents/MySQL/5.1/main
2006-07-24 02:32:49 +10:00
mikael/pappa@dator5.(none)
922058ae69 BUG#20340: NODEGROUP wrong field type in partitions information schema table
Fixes for change that makes default appear in NODEGROUP as it should be instead of 0 which is an error
2006-07-22 13:37:14 -04:00
mikael/pappa@dator5.(none)
bdf9ace4dd BUG#20340: NODEGROUP wrong field type in information schema
Test case fix
2006-07-22 11:27:45 -04:00
mikael/pappa@dator5.(none)
ab461c8933 Merge dator5.(none):/home/pappa/bug20340
into  dator5.(none):/home/pappa/bug20733
2006-07-22 10:13:47 -04:00
mikael/pappa@dator5.(none)
26b50311e7 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug20733
2006-07-22 10:12:57 -04:00
msvensson@neptunus.(none)
be1b24fec1 Bug#21039 Transaction cache not flushed after SELECT CREATE
- Disable test case until fixed
2006-07-21 20:49:12 +02:00
msvensson@neptunus.(none)
9c676b3d1d Bug#21188 mysqlimport returns random exit code
- Only handle return codes from 'pclose' greater than zero as errors.
 - It appears pclose can return -1 with errno set to ECHILD although the executin
process completed successfully.
2006-07-21 16:53:08 +02:00
msvensson@neptunus.(none)
97dfae2e49 Loop wait with timeout until 5000 records are in table after mysqlslap with INSERT DELAYED 2006-07-21 12:39:06 +02:00
ingo/mydev@chilla.local
84f3623b3d After merge fixes. 2006-07-21 10:43:10 +02:00
ingo/mydev@chilla.local
18a76a953c Merge chilla.local:/home/mydev/mysql-5.0-mmerge
into  chilla.local:/home/mydev/mysql-5.1-amain
2006-07-20 21:28:55 +02:00
msvensson@neptunus.(none)
0b786561ca After ndbd nodes has been restarted the mysqld's will enter "read only" mode until they are fully connected again. Wait in a loop until
mysqld's has exited from that.
2006-07-20 20:14:13 +02:00
pekka@orca.ndb.mysql.com
acb73b1e7e Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-mrg
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-mrg
2006-07-20 16:28:06 +02:00
msvensson@neptunus.(none)
df8637fccb Bug#20365 mysqlslap fails with error message about result sets
- Using CLIENT_MULTI_RESULTS is needed to execute stored procedures
2006-07-20 14:51:04 +02:00
mikael/pappa@dator5.(none)
cef004845c BUG20733: Bug in partition pruning with zerofill field
Problem was with handling NULL values in ranges
2006-07-20 05:28:16 -04:00
msvensson@neptunus.(none)
6cc8f5c0cd Add small sleep after cluster restart to allow mysqld's to exit from readonly state 2006-07-20 10:59:55 +02:00
pekka@orca.ndb.mysql.com
15783e44d0 ndb - bug#14935 fix 2006-07-19 14:49:58 +02:00
msvensson@neptunus.(none)
fe40a8cf9d Merge bk-internal:/home/bk/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-07-19 08:57:52 +02:00
andrey@lmy004.
02e14e6358 Merge lmy004.:/work/mysql-5.1-runtime
into  lmy004.:/work/mysql-5.1-clean
2006-07-18 23:22:24 +02:00
andrey@lmy004.
a68400dd98 Fix windows build of libmysqld. Curious why pushbuild did not
catch that.
Stale CMakeLists.txt
2006-07-18 23:08:13 +02:00
gluh@mysql.com/vva.(none)
7c0930c4ae after merge fix 2006-07-18 20:13:13 +05:00
gluh@myoffice.izhnet.ru
f76aec6d90 Merge myoffice.izhnet.ru:/usr/home/gluh/MySQL/tmp_merge
into  myoffice.izhnet.ru:/usr/home/gluh/MySQL/5.1
2006-07-18 18:43:55 +05:00
mikael/pappa@dator5.(none)
4b71f42dd3 BUG#20340: NODEGROUP in information_schema.partitions integer =>
error in error log when "default is put into it
NODEGROUP string to cater for "default" in it
2006-07-18 09:33:40 -04:00
msvensson@neptunus.(none)
601d948099 Fix erroneous join function use 2006-07-18 15:15:43 +02:00
msvensson@neptunus.(none)
da214608b4 Add verbose printouts for im_start and im_stop 2006-07-18 14:53:50 +02:00
holyfoot/abotchkov@production.mysql.com
fbd94751b8 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  production.mysql.com:/usersnfs/abotchkov/mysql-5.0.mrg
2006-07-18 14:53:19 +02:00
holyfoot/hf@mysql.com/deer.(none)
00f56da9af merging 2006-07-18 16:43:39 +05:00
holyfoot/hf@mysql.com/deer.(none)
bed7b69243 Merge mysql.com:/home/hf/work/mysql-4.1.mrg
into  mysql.com:/home/hf/work/mysql-5.0.mrg
2006-07-18 14:52:29 +05:00
msvensson@neptunus.(none)
f0300aff5b Merge neptunus.(none):/home/msvensson/mysql/my50-maint-yassl-20060717
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-07-18 09:52:14 +02:00
mikael/pappa@dator5.(none)
bae61f209d Fixed test case 2006-07-17 06:53:46 -04:00
mikael/pappa@dator5.(none)
6019ac9b71 Fixes for strange appearance of db.opt file 2006-07-17 06:41:12 -04:00
msvensson@shellback.(none)
0af88d0eb3 Merge shellback.(none):/home/msvensson/mysql/my50-yassl
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-17 11:27:12 +02:00
msvensson@shellback.(none)
011f57e0ec Import yaSSL version 1.3.7
- Fix for "bug#16755 Please find a SSL library that is FLOSS-Exception / LGPL copyrighted"
2006-07-17 10:50:20 +02:00
mikael/pappa@dator5.(none)
3d44231064 Minor fix 2006-07-15 17:05:47 -04:00
mikael/pappa@dator5.(none)
1df07ba2d8 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
into  dator5.(none):/home/pappa/push_tree_w28
2006-07-15 17:04:56 -04:00
pekka@orca.ndb.mysql.com
14519de0fc Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
2006-07-15 21:44:25 +02:00
pekka@orca.ndb.mysql.com
6da1b59c08 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51
2006-07-15 18:02:47 +02:00
mikael/pappa@dator5.(none)
1c1a131675 Remove files that tests leave behind 2006-07-15 12:01:46 -04:00
mikael/pappa@dator5.(none)
27b06d9dd0 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/push_tree_w28
2006-07-15 11:59:39 -04:00
pekka@orca.ndb.mysql.com
54571ec6ad ndb - ndb_restore: print some dd errors at right verbosity 2006-07-15 17:53:57 +02:00
mikael/pappa@dator5.(none)
cc545cc6cf Fixes to make tests work in conjunction with other tests 2006-07-15 07:28:31 -04:00
mikael/pappa@dator5.(none)
30989a77a7 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/push_tree_w28
2006-07-15 04:06:31 -04:00
mikael/pappa@dator5.(none)
cacbb674b1 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
into  dator5.(none):/home/pappa/push_tree_w28
2006-07-15 03:59:53 -04:00
mikael/pappa@dator5.(none)
a6f310d0c2 Merge dator5.(none):/home/pappa/bug20852
into  dator5.(none):/home/pappa/push_tree_w28
2006-07-15 03:49:01 -04:00
mikael/pappa@dator5.(none)
425c8883bb Merge dator5.(none):/home/pappa/bug20770
into  dator5.(none):/home/pappa/push_tree_w28
2006-07-15 03:46:01 -04:00
mikael/pappa@dator5.(none)
5a2edb5065 Merge dator5.(none):/home/pappa/bug20767
into  dator5.(none):/home/pappa/push_tree_w28
2006-07-15 03:41:41 -04:00
mikael/pappa@dator5.(none)
cfc65ef720 BUG#20389: Crash when using index scan in reverse order 2006-07-15 03:38:34 -04:00
tsmith/tim@siva.hindu.god
6971ddee1a Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  siva.hindu.god:/usr/home/tim/m/bk/merge-51
(which is mysql-5.1-new-maint team tree)
2006-07-15 00:33:24 -06:00