tsmith@siva.hindu.god
498756195a
Merge siva.hindu.god:/home/tsmith/m/bk/51
...
into siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-02-08 16:02:58 -07:00
msvensson@pilot.mysql.com
764d84852e
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-07 15:11:19 +01:00
msvensson@pilot.mysql.com
eee38feda8
Avoid problem with "noinst_HEADERS" being sucked into "mysqld_LDADD" if openssl_libs and yassl_libs are empty strings
2007-02-07 15:11:03 +01:00
mskold/marty@linux.site
65c9dcc011
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-02-07 12:06:13 +01:00
mskold/marty@linux.site
8dd443f986
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-02-07 11:44:41 +01:00
mskold/marty@linux.site
fd0232b226
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-02-07 11:40:43 +01:00
tomas@poseidon.mysql.com
7e29b2fed0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-07 17:37:10 +07:00
mskold/marty@mysql.com/linux.site
2d0bd82a06
NdbScanOperation.hpp, NdbScanOperation.cpp, ha_ndbcluster.cc:
...
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
ha_ndbcluster.h:
Removed stray mthod declaration
2007-02-07 11:36:34 +01:00
tomas@poseidon.mysql.com
2ab5d67932
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-07 17:01:31 +07:00
mskold/marty@linux.site
bb8924cf39
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-02-07 09:52:10 +01:00
mskold/marty@mysql.com/linux.site
931a48904d
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added original test case
2007-02-07 09:49:16 +01:00
mskold/marty@linux.site
5d35ff3da1
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-02-07 09:37:18 +01:00
mskold/marty@linux.site
270fd100b7
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-02-07 09:32:34 +01:00
mskold/marty@mysql.com/linux.site
259d3dce26
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: post-review fix, added default value
2007-02-07 09:19:33 +01:00
mskold/marty@linux.site
6aee9eedf7
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-02-06 23:48:53 +01:00
mskold/marty@linux.site
b13e5b8ee9
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-02-06 23:42:24 +01:00
mskold/marty@mysql.com/linux.site
0446aa9cbd
Fix for bug#25821 Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range
2007-02-06 23:06:58 +01:00
msvensson@pilot.mysql.com
5d744adc11
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-06 23:02:33 +01:00
msvensson@pilot.mysql.com
0ee93fdb02
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-06 23:01:48 +01:00
msvensson@pilot.mysql.com
b6da082559
Merge 192.168.0.10:mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-02-06 23:01:01 +01:00
msvensson@neptunus.(none)
2fb664cb38
Bug#25344 Segmentation violation when try to run the perror utility
...
- strerror might return NULL on some platforms
2007-02-06 23:00:18 +01:00
svoj@mysql.com/april.(none)
db8a7b513c
Excluded wrongly merged changeset.
2007-02-07 01:37:21 +04:00
msvensson@pilot.mysql.com
07dd9a61c1
Bug#26015 valgrind warning PollGuard::unlock_and_signal()/NdbCondition_Destroy
...
- Add variable "ndbcluster_binlog_terminating" and use that to signal
the cluster binlog thread it's time to shutdown. This allows
exact control of when the thread shutdown, previous implementation
would start shutdown of the thread as soon as the mysqld started
shutdown. Now we will shutdown cluster binlog thread
in 'ndbcluster_binlog_end'
2007-02-06 22:06:13 +01:00
msvensson@pilot.mysql.com
5274fa7c9d
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-06 22:01:21 +01:00
msvensson@pilot.mysql.com
19771b410a
Fix merge error
2007-02-06 22:00:48 +01:00
msvensson@pilot.mysql.com
e3a7ce7d3b
Merge 192.168.0.5:mysql/bug25203/my50-bug25203
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-06 21:55:39 +01:00
msvensson@pilot.mysql.com
95aff07426
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-06 20:26:06 +01:00
msvensson@pilot.mysql.com
6050927f76
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-06 20:24:42 +01:00
msvensson@pilot.mysql.com
5959ca40d7
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-06 20:23:58 +01:00
msvensson@pilot.mysql.com
7006b2033e
Merge 192.168.0.10:mysql/yassL-import/my51-yassL-import
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-06 20:23:28 +01:00
msvensson@pilot.mysql.com
5885fba43b
Merge 192.168.0.10:mysql/yassL-import/my50-yassL-import
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-06 18:52:18 +01:00
msvensson@neptunus.(none)
5f5b0e9b39
Merge neptunus.(none):/home/msvensson/mysql/yassL-import/my50-yassL-import
...
into neptunus.(none):/home/msvensson/mysql/yassL-import/my51-yassL-import
2007-02-06 17:34:06 +01:00
msvensson@neptunus.(none)
6fc734a768
Bug#24157 openssl_1 regression test is broken two different ways
...
- Send output from 'ERR_print_errors_fp' to DBUG_FILE if --debug is used
2007-02-06 17:33:11 +01:00
msvensson@pilot.mysql.com
324b136f4f
Update result file for 5.1
2007-02-06 17:23:21 +01:00
msvensson@pilot.mysql.com
c481446873
Fix merge error
2007-02-06 17:22:56 +01:00
msvensson@pilot.mysql.com
836f777b55
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-06 16:38:56 +01:00
msvensson@pilot.mysql.com
b6bd53aa9d
Correct the non working check for --skip-log-bin in "extra_opt"
2007-02-06 16:38:32 +01:00
msvensson@neptunus.(none)
38fa3ed693
Bug#25988 openssl_1 Test Case Fails
...
- Small difference in output from 'X509_NAME_Oneline' between OpenSSL and yaSSL. OpenSSL uses
an extension that allow's the email adress of the cert holder.
- Imported patch for yaSSL "add email to DN output"
2007-02-06 16:28:36 +01:00
msvensson@pilot.mysql.com
d9439eda43
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-06 15:52:33 +01:00
msvensson@pilot.mysql.com
69510b7089
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-06 15:50:53 +01:00
msvensson@pilot.mysql.com
6ba81ba5eb
Merge 192.168.0.10:mysql/mysql-5.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-06 15:50:24 +01:00
msvensson@neptunus.(none)
15008f6728
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2007-02-06 15:48:08 +01:00
msvensson@neptunus.(none)
e4001b3b5a
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2007-02-06 15:46:17 +01:00
msvensson@pilot.mysql.com
f7e566c944
Fix windows build
2007-02-06 15:03:28 +01:00
msvensson@pilot.mysql.com
d018030b20
Merge 192.168.0.10:mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-06 14:48:22 +01:00
msvensson@neptunus.(none)
ede3afe470
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-02-06 14:45:08 +01:00
msvensson@pilot.mysql.com
256cb08ba9
Merge 192.168.0.10:mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-02-06 14:44:05 +01:00
msvensson@neptunus.(none)
6502f4300b
Merge neptunus.(none):/home/msvensson/mysql/my41-nmj
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2007-02-06 14:42:40 +01:00
msvensson@pilot.mysql.com
f6d3ac52dd
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-06 14:32:08 +01:00
msvensson@pilot.mysql.com
61686e8556
Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-06 14:30:23 +01:00