brian@zim.(none)
|
b46c727a66
|
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into zim.(none):/home/brian/mysql/merge-5.1
|
2006-11-10 17:25:39 -08:00 |
|
brian@zim.(none)
|
739f2c27d0
|
This patch fixes the example engine, the example parser, and the example daemon to compile. AKA You can now test that the interface is actually working :)
|
2006-11-10 17:21:59 -08:00 |
|
baker@bk-internal.mysql.com
|
079506b5a0
|
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
|
2006-11-07 06:59:51 +01:00 |
|
brian@zim.(none)
|
8a56fcff6a
|
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into zim.(none):/home/brian/mysql/merge-5.1
|
2006-11-05 12:06:09 -08:00 |
|
brian@zim.(none)
|
1a92614216
|
Removed Innodb variable at request of Innobase.
|
2006-11-05 12:03:19 -08:00 |
|
msvensson@neptunus.(none)
|
a56565b8d5
|
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
|
2006-11-04 13:06:51 +01:00 |
|
msvensson@neptunus.(none)
|
56f10ac81a
|
Remove old comments
|
2006-11-04 13:06:19 +01:00 |
|
msvensson@neptunus.(none)
|
abd1e54de7
|
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
|
2006-11-04 09:32:36 +01:00 |
|
msvensson@neptunus.(none)
|
83a44bd8ff
|
Disable user_limits for bug23921
|
2006-11-04 09:24:10 +01:00 |
|
msvensson@neptunus.(none)
|
39a346b79a
|
Updates for abi_check
|
2006-11-04 09:23:19 +01:00 |
|
msvensson@neptunus.(none)
|
d59a3b4d43
|
Merge neptunus.(none):/home/msvensson/mysql/my50-m-stress
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
|
2006-11-04 09:20:20 +01: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
ramil/ram@mysql.com/myoffice.izhnet.ru
|
9658dc9127
|
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into mysql.com:/usr/home/ram/work/bug22913/my41-bug22913
|
2006-11-02 16:25:01 +04:00 |
|
ramil/ram@mysql.com/myoffice.izhnet.ru
|
82ec5bd111
|
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/usr/home/ram/work/bug22913/my50-bug22913
|
2006-11-02 16:20:52 +04:00 |
|
ramil/ram@myoffice.izhnet.ru
|
c8aa094849
|
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/usr/home/ram/work/bug22913/my51-bug22913
|
2006-11-02 16:15:01 +04:00 |
|
thek@kpdesk.mysql.com
|
d4b3cefb23
|
Bug#22828 complementary patch:
- 'false' not defined in C, use FALSE instead.
|
2006-11-02 11:55:41 +01:00 |
|
ramil/ram@myoffice.izhnet.ru
|
9b99d8c747
|
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/usr/home/ram/work/bug22913/my51-bug22913
|
2006-11-02 14:42:45 +04:00 |
|
ramil/ram@myoffice.izhnet.ru
|
77b0a44146
|
Merge mysql.com:/usr/home/ram/work/bug22913/my50-bug22913
into mysql.com:/usr/home/ram/work/bug22913/my51-bug22913
|
2006-11-02 14:35:42 +04:00 |
|