kent@mysql.com/g4-2.local
b329f2c3ef
Many files:
...
Deleted config/ac-macros/ha_berkeley.m4
Removed more referenses to bdb
2006-08-21 15:34:29 +02:00
msvensson@neptunus.(none)
2f0b080aea
Bug#19810 Bundled YASSL in libmysqlclient conflicts with OpenSSL
...
- Rename yaSSL version of 'SSL_peek' to 'yaSSL_peek' by using a macro
2006-08-21 14:51:59 +02:00
rburnett@bk-internal.mysql.com
e37e0786fc
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-21 14:38:58 +02:00
msvensson@shellback.(none)
adaa3a2a60
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-21 14:09:38 +02:00
msvensson@shellback.(none)
2b2985e0ea
Print lines from log file to see what's in them
2006-08-21 14:06:59 +02:00
jani@hasky.mysql.fi
6dc1122084
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hasky.mysql.fi:/home/jani/mysql-5.0_bug21537
2006-08-21 13:06:45 +03:00
dlenev@mockturtle.local
a486f95547
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg21216-2
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg19403-2
2006-08-21 12:28:35 +04:00
dlenev@mockturtle.local
186fa6c291
Fix for bug#21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES causes
...
server to crash".
Crash caused by assertion failure happened when one ran SHOW OPEN TABLES
while concurrently doing DROP TABLE (or RENAME TABLE, CREATE TABLE LIKE
or any other command that takes name-lock) in other connection.
For non-debug version of server problem exposed itself as wrong output
of SHOW OPEN TABLES statement (it was missing name-locked tables).
Finally in 5.1 both debug and non-debug versions simply crashed in
this situation due to NULL-pointer dereference.
This problem was caused by the fact that table placeholders which were
added to table cache in order to obtain name-lock had TABLE_SHARE::table_name
set to 0. Therefore they broke assumption that this member is non-0 for
all tables in table cache which was checked by assert in list_open_tables()
(in 5.1 this function simply relies on it).
The fix simply sets this member for such placeholders to appropriate value
making this assumption true again.
This patch also includes test for similar bug 12212 "Crash that happens
during removing of database name from cache" reappeared in 5.1 as bug 19403.
2006-08-21 12:18:59 +04:00
msvensson@shellback.(none)
457a7702f6
Turn on reorder by default
2006-08-21 09:53:49 +02:00
msvensson@shellback.(none)
447d2fefdf
Break out and create new function 'run_testcase_check_skip_test'
2006-08-21 09:53:04 +02:00
jpipes@shakedown.(none)
56443ae201
Fix for bug #21642 : "configure" with no arguments does not build
2006-08-20 17:24:48 -04:00
msvensson@neptunus.(none)
0f54eccbb0
Move the initialisation of "NDB_STATUS_OK" env variable to after cluster has been intalled
2006-08-20 20:46:50 +02:00
brian@zim.(none)
f68ce0ddef
This changeset moves the ha_myisam files to their storage directories. It also includes updates for all engines include patch for windows builds.
2006-08-19 17:38:42 -07:00
brian@zim.(none)
800e348740
Update to push all of merge into the merge storage directory.
2006-08-19 10:23:22 -07:00
brian@zim.(none)
849fac1496
Moved heap into its own directory.
2006-08-19 08:02:52 -07:00
brian@zim.(none)
3d09079e31
Major changes are plug.in files created for almost all storage engines. A few stray BDB references removed.
2006-08-18 21:19:19 -07:00
tnurnberg@salvation.intern.azundris.com
9335cba3e4
17926 duplicates Bug#1989 in bug db
...
on up-merging 17926 from 5.0 tree it collides with near-identical fix 1989
in 5.1 tree. backing 17926 out of 5.1 tree.
2006-08-18 19:29:54 +02:00
holyfoot/hf@mysql.com/deer.(none)
cf76884b38
Fix for the failing gis.test
2006-08-18 22:29:35 +05:00
joerg@trift2.
1f79db41fa
mysql-test-run.pl : Fix the search path for "ndb_mgmd" and "ndbd". bug#21721
2006-08-18 18:24:38 +02:00
rburnett@bk-internal.mysql.com
d094b5f2f5
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-18 15:46:41 +02:00
tnurnberg@salvation.intern.azundris.com
e0592f53cb
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
2006-08-18 15:27:29 +02:00
petr/cps@mysql.com/owlet
30ef47a93c
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2006-08-18 16:48:32 +04:00
tnurnberg@salvation.intern.azundris.com
da6943872a
Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-maint
...
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
2006-08-18 14:34:15 +02:00
tnurnberg@salvation.intern.azundris.com
c8d1c498fb
innodb r702
...
innodb r719
2006-08-18 14:16:11 +02:00
cmiller@zippy.cornsilk.net
9e5db9f6ea
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-08-18 07:09:21 -04:00
cmiller@zippy.cornsilk.net
dc1e177697
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-18 06:50:08 -04:00
jimw@rama.(none)
abc148000d
Bug #21288 : mysqldump segmentation fault when using --where
...
The problem was that the error handling was using a too-small buffer to
print the error message generated. We fix this by not using a buffer at
all, but by using fprintf() directly. There were also some problems with
the error handling in table dumping that was exposed by this fix that were
also corrected.
2006-08-17 14:09:24 -07:00
tnurnberg@salvation.intern.azundris.com
9e922430bb
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
2006-08-17 23:08:51 +02:00
rburnett@bk-internal.mysql.com
4b7e3775be
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-17 22:30:32 +02:00
rburnett@production.mysql.com
284fa931bb
A couple of adjustments to the merge to fix the broken build
...
instance.cc:
Removed wrongly placed closing brace
item_geofunc.cc:
needed to pass in a TABLE_SHARE* instead of a TABLE*
2006-08-17 22:24:35 +02:00
cmiller@zippy.cornsilk.net
99b113f48e
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-08-17 14:49:32 -04:00
andrey@example.com
30b4a45998
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into example.com:/work/mysql-5.1-runtime
2006-08-17 19:09:55 +02:00
cmiller@zippy.cornsilk.net
6d35e75cda
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-17 12:59:44 -04:00
rburnett@bk-internal.mysql.com
9d531c4f43
rename to avoid case sensitive collision
2006-08-17 18:50:58 +02:00
tnurnberg@salvation.intern.azundris.com
d7cbdfaa3d
Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-i51
...
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
2006-08-17 18:39:30 +02:00
cmiller@zippy.cornsilk.net
e65a3e97b5
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-08-17 12:38:30 -04:00
cmiller@zippy.cornsilk.net
c821fa8bc6
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-17 12:17:52 -04:00
andrey@example.com
081b865936
Cleanup patch.
...
There is an existing macros for initializing LEX_STRINGs
with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
(char *) STRING_WITH_LEN -> C_STRING_WITH_LEN
2006-08-17 18:13:45 +02:00
rburnett@bk-internal.mysql.com
d65095b451
Merge bk-internal.mysql.com:/data0/bk/tmp_reg
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1
2006-08-17 17:19:41 +02:00
cmiller@zippy.cornsilk.net
64092ca93b
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:55:57 -04:00
cmiller@zippy.cornsilk.net
6998c5140b
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:53:12 -04:00
cmiller@zippy.cornsilk.net
7d38d61398
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:49:56 -04:00
cmiller@zippy.cornsilk.net
030ddb48f3
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:47:23 -04:00
cmiller@zippy.cornsilk.net
c627a6ce84
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:42:50 -04:00
rburnett@bk-internal.mysql.com
1bfe766869
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-17 16:37:16 +02:00
tnurnberg@maint1.mysql.com
781658d64b
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into maint1.mysql.com:/data/localhome/tnurnberg/mysql-5.1-maint-i51
2006-08-17 16:15:09 +02:00
tnurnberg@salvation.intern.azundris.com
d1e1ea2c27
temporarily disabled partition test, fails w/ PS protocol, filed as Bug#21658
2006-08-17 16:01:33 +02:00
pgalbraith/patg@govinda.patg.net
dd1d46c2cd
merge warning test results (!)
2006-08-16 20:39:33 -07:00
pgalbraith/patg@govinda.patg.net
ceb7cb55e7
test result changes (non-functional) for 5.1-5.0 merge
2006-08-16 17:16:36 -07:00
iggy@rolltop.ignatz42.dyndns.org
00ab7be7b9
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge
2006-08-16 19:31:33 -04:00