Commit graph

10916 commits

Author SHA1 Message Date
petr/cps@owlet.local
5fae48d9e4 Merge mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-08-23 17:15:24 +04:00
petr/cps@owlet.local
2763504be4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-08-23 16:48:39 +04:00
msvensson@neptunus.(none)
b2a95f0dac Update result file for "grant" to 5.1 version 2006-08-22 14:16:39 +02:00
cmiller@zippy.cornsilk.net
d170f1b124 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-21 16:59:53 -04:00
cmiller@zippy.cornsilk.net
f2f90320de 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-21 12:59:46 -04:00
cmiller@zippy.cornsilk.net
ff57b304a4 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-21 12:55:43 -04: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
holyfoot/hf@mysql.com/deer.(none)
cf76884b38 Fix for the failing gis.test 2006-08-18 22:29:35 +05: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
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@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
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
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
iggy@rolltop.ignatz42.dyndns.org
ca6532af50 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_20328
2006-08-16 16:16:10 -04:00
iggy@rolltop.ignatz42.dyndns.org
a86f035a08 Bug#20328 - Correction to test/result for broken Windows build. 2006-08-16 13:55:16 -04:00
patg@govinda.patg.net
b56ff54805 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
2006-08-16 10:05:24 -07:00
patg@govinda.patg.net
79ad722e39 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
2006-08-16 10:03:24 -07:00
msvensson@shellback.(none)
da60a5194c Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-16 17:14:40 +02:00
msvensson@shellback.(none)
98eaa07600 Bug#20328 mysql client: dumb about trailing spaces on 'help' command
Fix testcase to also work on windows
2006-08-16 17:03:41 +02:00
rburnett@bk-internal.mysql.com
8baecf7ed6 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-16 16:04:10 +02:00
rburnett@bk-internal.mysql.com
f23643cc54 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-16 15:58:25 +02:00
msvensson@shellback.(none)
b963293595 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-16 15:50:50 +02:00
holyfoot/hf@mysql.com/deer.(none)
c965eea789 Merge bk@192.168.21.1:mysql-5.0-kt
into  mysql.com:/home/hf/work/mysql-5.0.20910
2006-08-16 09:57:05 +05:00
ramil/rkalimullin@production.mysql.com
4ef5116425 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  production.mysql.com:/usersnfs/rkalimullin/mysql-5.0
2006-08-16 06:37:39 +02:00
brian@zim.(none)
8d83366bac Merge zim.(none):/home/brian/mysql/dep-5.1
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-15 13:53:13 -07:00
pgalbraith/patg@govinda.patg.net
67513cafa5 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
2006-08-15 09:02:53 -07:00
rburnett@bk-internal.mysql.com
344dd03774 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-15 17:58:39 +02:00
petr/cps@mysql.com/owlet
472279cec4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2006-08-15 19:11:12 +04:00
rburnett@bk-internal.mysql.com
8d5e2dd644 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-15 17:02:08 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b65bf3b4da Merge mysql.com:/usr/home/ram/work/tmp_merge
into  mysql.com:/usr/home/ram/work/mysql-5.0
2006-08-15 19:41:23 +05:00
mskold/marty@mysql.com/linux.site
3b42e84c44 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-08-15 15:57:36 +02:00
mskold/marty@mysql.com/linux.site
697b89cd54 bug #18184 SELECT ... FOR UPDATE does not work..: Updated test result file 2006-08-15 15:49:31 +02:00
holyfoot/hf@mysql.com/deer.(none)
81764f89cf Merge bk@192.168.21.1:mysql-5.0-kt
into  mysql.com:/home/hf/work/mysql-5.0.20910
2006-08-15 18:15:12 +05:00
mskold/marty@mysql.com/linux.site
66e8255491 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-08-15 13:37:39 +02:00
mskold/marty@mysql.com/linux.site
6a3143e2a0 ndb_lock.test, ndb_lock.result:
bug #18184  SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
2006-08-15 13:12:27 +02:00
brian@zim.(none)
deb37d146e Period removal for warning message. 2006-08-15 01:20:34 -07:00
bar@mysql.com/bar.intranet.mysql.r18.ru
9f6c76eb20 Merge mysql.com:/usr/home/bar/mysql-4.1.b19741
into  mysql.com:/usr/home/bar/mysql-5.0.b19741merge
2006-08-15 12:04:51 +05:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
e2d4aa2ca4 Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
into  xiphis.org:/home/antony/work2/mysql-5.0-merge
2006-08-14 21:27:36 -07:00
brian@zim.(none)
41f920b013 Merge zim.(none):/home/brian/mysql/dep-5.1
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-14 21:26:33 -07:00
brian@zim.(none)
16a5d97a5d Merge fixes 2006-08-14 16:50:52 -07:00
brian@zim.(none)
8deb5beb9c Merge zim.(none):/home/brian/mysql/dep-5.0
into  zim.(none):/home/brian/mysql/dep-5.1
2006-08-14 15:24:29 -07:00
kostja@bodhi.local
d03b39aaab Fix a test case (proper clean up). 2006-08-14 19:18:33 +04:00
rburnett@bk-internal.mysql.com
c189be6849 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-14 17:15:36 +02:00
rburnett@bk-internal.mysql.com
4bb7715482 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-14 17:13:31 +02:00