petr/cps@owlet.local
257ce16d58
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-08-24 16:18:58 +04:00
petr/cps@mysql.com/owlet.local
e36be72adb
after merge fix
2006-08-24 16:17:42 +04:00
andrey@example.com
f41f9bf0d9
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into example.com:/work/mysql-5.1-runtime
2006-08-23 15:51:37 +02:00
andrey@example.com
9c8c1817ce
Fix for bug #20665 All commands supported in Stored Procedures
...
should work in Prepared Statements. Post-review changeset.
Problem: There are some commands which are avaiable to be executed in SP
but cannot be prepared. This patch fixes this and makes it possible
prepare these statements.
Changes: The commands later are made available in PS. RESET has been forbidden
in SF/Trigger.
Solution: All current server commands where checked and those missing (see later)
we added. Tests for all of the commands with repeated executions were
added - testing with SP, SF and PS.
SHOW BINLOG EVENTS
SHOW (MASTER | SLAVE) STATUS
SHOW (MASTER | BINARY) LOGS
SHOW (PROCEDURE | FUNCTION) CODE (parsable only in debug builds)
SHOW CREATE (PROCEDURE | FUNCTION | EVENT | TABLE | VIEW)
SHOW (AUTHORS | CONTRIBUTORS | WARNINGS | ERRORS)
CHANGE MASTER
RESET (MASTER | SLAVE | QUERY CACHE)
SLAVE (START | STOP)
CHECKSUM (TABLE | TABLES)
INSTALL PLUGIN
UNINSTALL PLUGIN
CACHE INDEX
LOAD INDEX INTO CACHE
GRANT
REVOKE
KILL
(CREATE | RENAME | DROP) DATABASE
(CREATE | RENAME | DROP) USER
FLUSH (TABLE | TABLES | TABLES WITH READ LOCK | HOSTS | PRIVILEGES |
LOGS | STATUS | MASTER | SLAVE | DES_KEY_FILE | USER_RESOURCES)
2006-08-23 15:50:06 +02:00
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
rburnett@bk-internal.mysql.com
f98b21b732
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-21 20:27:32 +02: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
joerg@trift2.
47d6296bc7
mysql-test/mysql-test-run.pl : Use fixed path names for all NDB binaries,
...
because searching for them makes the script abort with all non-NDB builds.
2006-08-21 16:19:29 +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
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
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
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
pgalbraith/patg@govinda.patg.net
370f22418b
merge 5.0 -> 5.1, re-enabling federated, disabled partition
2006-08-16 10:47:53 -07: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
rburnett@bk-internal.mysql.com
38a36da86d
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-16 17:47:20 +02:00
reggie@big_geek.
55165b2f55
small fix to enable the test suite to find executables and scripts on Windows
2006-08-16 10:19:48 -05: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)
27a4154631
Merge shellback.(none):/home/msvensson/mysql/bug20219/my50-bug20219
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-16 15:52:52 +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
msvensson@shellback.(none)
ba1ac55acf
Bug#20219 make bin-dist produces unportable for testing tarball
...
- Setup LD_LIBRARY_PATH to favor local libs
2006-08-16 15:25:30 +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