gkodinov@dl145s.mysql.com
32c9e11df9
Merge bk-internal:/home/bk/mysql-5.1
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-11-28 17:14:16 +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
msvensson@neptunus.(none)
8a0761201a
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 11:50:48 +01:00
monty@mysql.com/nosik.monty.fi
93f246d4c1
Fixed portablity problem
...
Removed warnings from mysqltest scripts
2006-11-28 05:43:30 +02:00
monty@mysql.com/nosik.monty.fi
73238029bc
Disabled syncronization test at it fails on multiple platforms. (Bug #24529 )
...
Fixed that test_thr_alarm works
2006-11-27 23:19:53 +02:00
jpipes@shakedown.(none)
03a5dcd7ce
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
2006-11-27 14:58:57 -05: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)
76b8b450d6
Fix for rpl000015 that fails if $MYSQL_TCP_PORT is set. The default value for
...
master_port after a "change master" will be set to the compiled in default value
i.e not always the same as what the master report as it's port number.
2006-11-27 19:56:04 +01:00
gkodinov@dl145s.mysql.com
e74c9add47
Merge bk-internal:/home/bk/mysql-5.0
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-11-27 16:25:52 +01:00
monty@nosik.monty.fi
313f23a93a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into mysql.com:/home/my/mysql-5.1
2006-11-27 14:07:52 +02: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
monty@mysql.com/nosik.monty.fi
fa81a82e7f
Fixed a LOT of compiler warnings
...
Added missing DBUG_RETURN statements (in mysqldump.c)
Added missing enums
Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes
Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.
2006-11-27 01:47:38 +02: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
jani/jamppa@bk-internal.mysql.com
e394d254fb
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2006-11-24 16:46:27 +01:00
kaa@polly.local
699898c82c
Merge polly.local:/tmp/maint/bug22077/my50-bug22077
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-11-24 17:01:43 +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)
86f0d1bb03
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-24 12:12:25 +01: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
ramil/ram@mysql.com/myoffice.izhnet.ru
d6f06d4245
after-merge fix-up.
2006-11-22 17:59:46 +04:00
monty@nosik.monty.fi
89570bf966
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2006-11-22 14:11:36 +02:00
gkodinov/kgeorge@macbook.gmz
9004d93b44
Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.1
...
into macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt
2006-11-22 12:48:29 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
8512b7e5bd
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug21789/my41-bug21789
2006-11-22 14:06:37 +04:00
ramil/ram@myoffice.izhnet.ru
abfd0285d2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug21789/my51-bug21789
2006-11-22 13:41:33 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
802f7fc366
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
2006-11-22 12:40:15 +04:00
ramil/ram@myoffice.izhnet.ru
d40abd8738
Merge mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
...
into mysql.com:/usr/home/ram/work/bug21789/my51-bug21789
2006-11-22 12:13:09 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b11dba2f0b
Merge mysql.com:/usr/home/ram/work/bug21789/my41-bug21789
...
into mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
2006-11-22 12:10:18 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
711b6a63be
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
2006-11-22 10:52:44 +04: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
ramil/ram@mysql.com/myoffice.izhnet.ru
c6e856de10
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug22029/my41-bug22029
2006-11-22 10:30:46 +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
ramil/ram@mysql.com/myoffice.izhnet.ru
b1a423d9f6
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
2006-11-22 10:27:11 +04: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
iggy@rolltop.ignatz42.dyndns.org
ef77a83bc2
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my50-bug19799
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799
2006-11-22 00:53:36 -05:00
iggy@rolltop.ignatz42.dyndns.org
26e05951ab
Bug#19799 delimiter command not working correctly when sourcing a sql file
...
- Post Merge Fix.
2006-11-22 00:52:32 -05: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
monty@nosik.monty.fi
38a92caeb7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-11-21 23:12:45 +02:00
monty@mysql.com/nosik.monty.fi
f6682e2743
Added --debug-info to most clients to detect memory leaks in mysql-test-run
...
Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
2006-11-21 22:32:58 +02:00
gluh@mysql.com/gluh.(none)
e37d08155b
after merge fix
2006-11-21 16:45:05 +04:00
gluh@gluh.(none)
a128f60337
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2006-11-21 14:04:43 +04:00
gluh@mysql.com/gluh.(none)
ff38409128
Bug#22413 EXPLAIN SELECT FROM view with ORDER BY yield server crash
...
disable filling of I_S tables for EXPLAIN
2006-11-21 13:45:01 +04:00
monty@mysql.com/nosik.monty.fi
306b871d52
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-11-20 22:46:52 +02:00
monty@mysql.com/nosik.monty.fi
e825879800
Remove compiler warnings
...
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
2006-11-20 22:42:06 +02: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
holyfoot/hf@deer.(none)
989117071a
Merge mysql.com:/home/hf/work/mysql-5.0-0mrg
...
into mysql.com:/home/hf/work/mysql-5.1-mrg
2006-11-19 22:26:36 +04:00