thek@kpdesk.mysql.com
81420d5e38
Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043
...
into kpdesk.mysql.com:/home/thek/dev/bug22043/my51-bug22043
2006-11-28 17:34:03 +01:00
thek@kpdesk.mysql.com
294cb8432f
Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE EXISTS"
...
- CREATE PROCEDURE stores database name based on query context instead
of 'current database' as set by 'USE' according to manual.
The bug reporter interpret the filtering statements as bug for
DROP PROCEDURE based on this behavior.
- Removed the code which changes db context.
- Added code to check that a valid db was supplied.
2006-11-28 16:03:53 +01:00
jpipes@shakedown.(none)
7c7b1ede76
Merge shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
...
into shakedown.(none):/home/jpipes/dev/mysql-5.1-new-maint2
2006-11-27 14:46:48 -05:00
msvensson@neptunus.(none)
1bd6e4f66a
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-27 10:39:40 +01:00
kaa@polly.local
332afaa7b6
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2006-11-24 23:45:31 +03:00
kaa@polly.local
9ff59261bd
Merge polly.local:/tmp/maint/bug22077/my50-bug22077
...
into polly.local:/tmp/maint/bug22077/my51-bug22077
2006-11-24 16:23:40 +03:00
msvensson@neptunus.(none)
0e4d97edf0
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-23 18:38:27 +01:00
andrey@example.com
2a148b400d
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/bug24396/my51
2006-11-22 14:11:11 +01:00
andrey@example.com
35238085d6
fix for bug#24396
2006-11-22 14:06:59 +01:00
ramil/ram@myoffice.izhnet.ru
38c04fb528
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug22029/my51-bug22029
2006-11-22 10:49:24 +04:00
iggy@rolltop.ignatz42.dyndns.org
1917e12506
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my50-bug19799
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799
2006-11-22 01:27:44 -05:00
iggy@rolltop.ignatz42.dyndns.org
e2a6759c4a
Bug#19799 delimiter command not working correctly when sourcing a sql file
...
- Use more appropriate test case.
2006-11-22 01:27:06 -05:00
ramil/ram@myoffice.izhnet.ru
530325adec
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug22029/my51-bug22029
2006-11-22 10:10:55 +04:00
ramil/ram@myoffice.izhnet.ru
5060fa10f8
Merge mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
...
into mysql.com:/usr/home/ram/work/bug22029/my51-bug22029
2006-11-22 09:29:22 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0a415e360c
Merge mysql.com:/usr/home/ram/work/bug22029/my41-bug22029
...
into mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
2006-11-22 09:19:51 +04:00
iggy@rolltop.ignatz42.dyndns.org
dead0ccb9d
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my50-bug19799
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799
2006-11-21 21:10:54 -05:00
iggy@rolltop.ignatz42.dyndns.org
bface97ecc
Bug#19799 delimiter command not working correctly when sourcing a sql file
...
- Client side readline functions unconditionally search for Unix '\n' line
endings. In this case, the delimiter statement was set to '//\r' instead
of the intended '//'. When removing the '\n' check for and remove
preceeding '\r' character as well.
2006-11-21 21:10:02 -05:00
msvensson@neptunus.(none)
7673a2d415
Update mysql_fix_privilege_tables.sql to handle upgrade from 5.0 while retaining
...
old upgrade behaviour.
Add test for upgrade from 5.0.30
2006-11-21 17:44:43 +01:00
msvensson@neptunus.(none)
0ed045f51d
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-21 16:54:44 +01:00
msvensson@neptunus.(none)
30088b9d23
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-21 16:51:47 +01:00
msvensson@neptunus.(none)
7cf226de11
Rename system_mysql_db_fix.test to system_mysql_db_fix30020 as it tests
...
mysql_fix_privilege_tables.s's ability to convert the system tables as of
3.20 to current system table format
Add similar test for 4.1.23 tables - but use "mysql < mysql_fix_privilege_tables.sql"
so it can be run on any platform.
2006-11-21 15:31:11 +01:00
iggy/Administrator@amd64.
3d1b9a66e4
Bug#23983 ps.test fails to open shared library
...
- When a shared library argument is supplied, it's checked for an OS
specific directory separator. The expected error is different
depending on the separator used. Create OS specific versions of these
tests.
2006-11-20 15:18:57 -05:00
iggy/Administrator@amd64.
fc556abe10
Bug#23983 ps.test fails to open shared library.
...
- Corrected mistake in Windows only test.
2006-11-20 14:11:12 -05:00
kaa@polly.local
346033a5da
Fix for bug #22077 "DROP TEMPORARY TABLE fails with wrong error if read_only is set"
...
Do not issue a 'read-only' error in case of DROP TEMPORARY TABLE on a non-existing temporary table.
Instead produce the correct "Unknown table" error or warning (in cases when the IF EXISTS clause was specified).
To a documentor: the part of the manual describing the 'read_only' system variable should be clarified to state the following:
"When the read_only variable is set to ON, all operations which create/update/drop tables are rejected with the exceptions for:
1. Any operation performed by the replication thread on a slave server
2. Any operation performed by a user that have the SUPER privilege
3. Any operation that creates/updates/drops only temporary tables"
2006-11-20 17:35:23 +03:00
iggy/Administrator@amd64.
bef72abf33
Merge amd64.:D:/src/mysql-5.1-maint
...
into amd64.:D:/src/mysql-5.1-maint_bug23983
2006-11-17 17:34:55 -05:00
iggy/Administrator@amd64.
5c5b24a114
Bug#23983 ps.test fails to open shared library.
...
- When a shared library argument is supplied, it's checked for an OS
specific directory separator. The expected error is different
depending on the separator used. Created OS specific versions of these
tests.
2006-11-17 16:52:41 -05:00
tnurnberg@salvation.intern.azundris.com
be53d55d28
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-16456
2006-11-17 21:32:08 +01:00
tnurnberg@salvation.intern.azundris.com
655056d32f
Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
...
Fix tests for new behaviour: an error is thrown if a NON DETERMINISTIC
stored function (SF) is called during statement-based replication (SBR).
2006-11-17 21:30:28 +01:00
andrey@example.com
df968abe3a
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/bug24219/my51
2006-11-16 16:44:08 +01:00
andrey@example.com
8b947e265b
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into example.com:/work/bug24219/my50
2006-11-16 16:37:07 +01:00
andrey@example.com
ebe1abf062
Merge example.com:/work/bug24219/my50
...
into example.com:/work/bug24219/my51
2006-11-16 14:16:32 +01:00
andrey@example.com
e5035f9020
Merge example.com:/work/bug24219/my41
...
into example.com:/work/bug24219/my50
2006-11-16 13:46:43 +01:00
andrey@example.com
de904f54bf
Fix for bug#24219 ALTER TABLE ... RENAME TO ... , DISABLE KEYS leads to crash
...
There was an improper order of doing chained operations.
To the documentor: ENABLE|DISABLE KEYS combined with RENAME TO, and no other
ALTER TABLE clause, leads to server crash independent of the presence of
indices and data in the table.
2006-11-16 13:18:37 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
1bd5c0d51d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug23653/my50-bug23653
2006-11-16 16:17:29 +04:00
ramil/ram@myoffice.izhnet.ru
82b82b0df3
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug23653/my51-bug23653
2006-11-16 16:15:33 +04:00
ramil/ram@myoffice.izhnet.ru
6ce719c515
Merge mysql.com:/usr/home/ram/work/bug23653/my50-bug23653
...
into mysql.com:/usr/home/ram/work/bug23653/my51-bug23653
2006-11-16 16:11:21 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b4dd41de69
Merge mysql.com:/usr/home/ram/work/bug23653/my41-bug23653
...
into mysql.com:/usr/home/ram/work/bug23653/my50-bug23653
2006-11-16 15:26:33 +04:00
cmiller@zippy.cornsilk.net
cba50775f7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-15 12:29:24 -05:00
cmiller@zippy.cornsilk.net
11b5d3fabc
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug19955/my50-bug19955
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-15 12:27:09 -05:00
cmiller@zippy.cornsilk.net
19b3bf2963
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug19955/my50-bug19955
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug19955/my51-bug19955
2006-11-15 12:24:21 -05:00
cmiller@zippy.cornsilk.net
5d4c57b900
Bug#19955: unsigned bigint used as signed with MOD function
...
Problem: When we have a really large number (between 2^63 and 2^64)
as the left side of the mod operator, it gets improperly corerced
into a signed value.
Solution: Added check to see if the "negative" number is really
positive, and if so, cast it.
2006-11-15 12:23:07 -05:00
tnurnberg@salvation.intern.azundris.com
95fabc6522
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-16456
2006-11-15 15:47:29 +01:00
msvensson@neptunus.(none)
46a599d868
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-15 13:23:42 +01:00
msvensson@neptunus.(none)
c9b4603f90
Update result file for mysql_upgrade as we have more tables that is checked in 5.1
...
Fix merge errors
2006-11-15 13:22:38 +01:00
lars@mysql.com/black.(none)
a265af4229
disabled test case that is still disabled in main
2006-11-15 13:05:13 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
3af7d5fa9d
Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
...
into dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
2006-11-15 13:05:37 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
10767f3f9a
Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/4.1
...
into dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
2006-11-15 12:55:43 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
5235785b2e
bug#19402 SQL close to the size of the max_allowed_packet fails on the slave
...
mending windows test.
2006-11-15 12:53:07 +02:00
andrey@example.com
bddd935bb0
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into example.com:/work/bug23760/my50
2006-11-15 11:50:30 +01:00
msvensson@neptunus.(none)
9f22fecf72
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-15 10:31:23 +01:00