malff/marcsql@weblab.(none)
ff4a58bcc8
Bug#21114 (Foreign key creation fails to table with name format)
...
Fixed the tests for case insensitive platforms
2006-11-03 09:56:44 -07:00
msvensson@neptunus.(none)
aa19771c7a
Fiexes for --stress mode in mysql-test-run.pl
2006-11-03 17:53:57 +01:00
msvensson@neptunus.(none)
899dca14ee
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-03 17:53:10 +01:00
msvensson@neptunus.(none)
63091e074a
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-03 16:18:32 +01:00
msvensson@neptunus.(none)
78af4ae44c
Fix problem with mysql.test relying on "echo" behaviour
2006-11-03 16:09:16 +01:00
msvensson@neptunus.(none)
fa79d0fccb
Fix DBUG_PRINT in mysqltest, the real value to print is in ds_cmd
2006-11-03 16:06:13 +01:00
msvensson@neptunus.(none)
570f603988
Don't warn about "Found non pid file" for elements that are not files.
2006-11-03 15:26:42 +01:00
msvensson@neptunus.(none)
b850ae8a54
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-03 14:40:52 +01:00
msvensson@neptunus.(none)
5c086315a5
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/my50-m-stress
2006-11-03 13:14:33 +01:00
msvensson@neptunus.(none)
795ad91bc3
Use lowercase for "Too long dbname" test as it will be put ot lower on some platforms and we don't wan't to test that.
2006-11-03 13:12:16 +01:00
msvensson@neptunus.(none)
74496f8d01
Remove sql_state-h from list of include files. (Merge error from 4.1)
2006-11-03 13:02:16 +01:00
msvensson@neptunus.(none)
1c19dc7ed0
Merge neptunus.(none):/home/msvensson/mysql/my41-m-stress
...
into neptunus.(none):/home/msvensson/mysql/my50-m-stress
2006-11-03 12:58:45 +01:00
msvensson@neptunus.(none)
7b4a8e41a6
Fix mysql-test-run.pl for "bin dist" look in "bin" directory for client binaries as well.
2006-11-03 12:32:05 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
afffedc0e3
Fix for bug #19736 VIEW: column names not quoted properly when view is replicated
...
When we write 'query=...' string to a frm file for views on a slave,
indentifiers are not properly quoted due to missing OPTION_QUOTE_SHOW_CREATE
flag in the thd->options.
Fix: properly set thd->options for the slave thread.
2006-11-03 15:27:37 +04:00
anozdrin/alik@alik.
18fb4abff4
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-monty
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2006-11-03 14:00:35 +03:00
msvensson@neptunus.(none)
580b540d25
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-03 11:50:59 +01:00
msvensson@neptunus.(none)
d94101f796
Fix typo, Add "s" to format specifier for --stress-init-file
2006-11-03 11:42:22 +01:00
kroki/tomash@moonlight.intranet
6967657466
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-cleanup
2006-11-03 12:47:32 +03:00
kroki/tomash@moonlight.intranet
b7fd43bcd0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup
2006-11-03 12:47:31 +03:00
kroki/tomash@moonlight.intranet
d5a69e6fa2
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-cleanup
2006-11-03 12:30:09 +03:00
kroki/tomash@moonlight.intranet
1dbf98d162
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-cleanup
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup
2006-11-03 12:25:34 +03:00
kroki/tomash@moonlight.intranet
fbf508d686
Cleanup: fix race in rename.test.
2006-11-03 12:16:31 +03:00
iggy@rolltop.ignatz42.dyndns.org
1d66d35fb3
Fix compile failure.
2006-11-02 21:03:41 -05:00
kent/mysqldev@suse9-x86.mysql.com
7c2ff3c307
sort.c:
...
Create block around DBUG_ENTER late in function
2006-11-03 02:35:09 +01:00
cmiller@zippy.cornsilk.net
e235c8c421
Fix merge collision.
2006-11-02 18:27:52 -05:00
cmiller@zippy.cornsilk.net
b074e13483
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-02 17:51:59 -05:00
cmiller@zippy.cornsilk.net
af5acac047
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-02 17:39:52 -05:00
cmiller@zippy.cornsilk.net
c34f3219b3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-11-02 17:27:42 -05:00
msvensson@shellback.(none)
15835edddd
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-02 23:09:32 +01:00
malff/marcsql@weblab.(none)
181459d444
Post merge fix
2006-11-02 14:02:07 -07:00
kent/mysqldev@mysql.com/production.mysql.com
27f3bb1065
configure.in:
...
Raise version number to 4.1.23
2006-11-02 21:58:42 +01:00
iggy@rolltop.ignatz42.dyndns.org
2704ba3675
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-11-02 15:16:33 -05:00
iggy@rolltop.ignatz42.dyndns.org
deb03b93ec
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my51-mtr_vs_config
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
2006-11-02 15:14:50 -05:00
iggy@rolltop.ignatz42.dyndns.org
cf65c157ee
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my51-mtr_vs_config
2006-11-02 15:11:22 -05:00
iggy@rolltop.ignatz42.dyndns.org
9f329f2cf2
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my41-mtr_vs_config
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config
2006-11-02 15:09:23 -05:00
iggy@rolltop.ignatz42.dyndns.org
39d7c5a6bc
Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations
...
Visual Studio builds each configuration in a different sub-directory. Only the sub-
directories for release and debug are currently searched.
2006-11-02 15:05:20 -05:00
cmiller@calliope.local
7b973f394f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into calliope.local:/Volumes/Source/src/mysql-5.1-maint
2006-11-02 14:28:40 -05:00
cmiller@calliope.local
948b9831a8
Fixed misuse of automake _DEPENDENCIES item. It caused Make try to create
...
a bogus dependency "-lz" .
2006-11-02 14:26:54 -05:00
anozdrin/alik@booka.
7096cd20a4
Wait for IM to start accepting connections after restart (part 2).
2006-11-02 21:43:52 +03:00
malff/marcsql@weblab.(none)
48a87f8ae0
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-21114_b
2006-11-02 11:13:04 -07:00
malff/marcsql@weblab.(none)
62c242cc75
Bug#21114 (Foreign key creation fails to table with name format)
...
Due to the complexity of this change, everything is documented in WL#3565
This patch is the third iteration, it takes into account the comments
received to date.
2006-11-02 11:01:53 -07:00
anozdrin/alik@booka.
8bc5a89178
Wait for IM to start accepting connections after restart.
2006-11-02 16:53:14 +03:00
ramil/ram@myoffice.izhnet.ru
4747665224
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/mysql-5.1-maint
2006-11-02 17:13:10 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
26117992be
Fix for bug #23762 : partition.test fails (partition_hash, partition_pruning as well)
...
When partition pruning is used we have to initialize key_part->flag in the
create_partition_index_descr() as it's checked in the get_mm_leaf().
2006-11-02 17:11:53 +04:00
andrey@example.com
63f7ca0662
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into example.com:/work/mysql-5.1-runtime-bug22830-new
2006-11-02 13:59:44 +01:00
andrey@example.com
c27a88ca2d
Better fix for bug#22830
...
Events: crash with procedure which alters events with function
Post-review CS
This fix also changes the handling of KILL command combined with
subquery. It changes the error message given back to "not supported",
from parse error. The error for CREATE|ALTER EVENT has also been changed
to generate "not supported yet" instead of parse error.
In case of a SP call, the error is "not supported yet". This change
cleans the parser from code which should not belong to there. Still
LEX::expr_allows_subselect is existant because it simplifies the handling
of SQLCOM_HA_READ which forbids subselects.
2006-11-02 13:51:43 +01:00
thek@kpdesk.mysql.com
cbc3de73cf
Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2006-11-02 13:37:17 +01:00
thek@kpdesk.mysql.com
3542d83a71
Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2006-11-02 13:35:28 +01:00
thek@kpdesk.mysql.com
3f16931527
Bug#22828 complementary patch:
...
- 'false' not defined in C, use FALSE instead.
2006-11-02 13:33:26 +01:00
thek@kpdesk.mysql.com
fd99994faf
Bug#22828 complementary patch:
...
- 'false' not defined in C, use FALSE instead.
2006-11-02 13:26:57 +01:00