stewart@willster.(none)
49eb41e09d
BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,
...
Change things around so that we add a row for each log file group that lists
the free space for that log file group.
2006-09-19 01:44:32 +10:00
evgen@moonbone.local
94028c618f
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-08-31 12:14:27 +04:00
evgen@moonbone.local
8cf9781717
Merge moonbone.local:/work/tmp_merge-5.0-mysql
...
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-08-29 18:58:50 +04:00
brian@zim.(none)
7216b5bc7a
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/arch-5.1
2006-08-25 14:07:30 -07:00
brian@zim.(none)
d41188130a
This is a cleanup of warnings that windows is complaining about.
2006-08-23 15:12:42 -07: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
msvensson@shellback.(none)
adaa3a2a60
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-21 14:09:38 +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
6998c5140b
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:53:12 -04:00
msvensson@shellback.(none)
a6a8ea0bc9
Remove duplicate free of "ds_res"
2006-08-16 20:38:33 +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
brian@zim.(none)
8deb5beb9c
Merge zim.(none):/home/brian/mysql/dep-5.0
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-08-14 15:24:29 -07:00
kostja@bodhi.local
5dfdc8bfce
Manual merge 5.0->5.1. Post-merge fixes.
2006-08-14 13:27:11 +04:00
kostja@bodhi.local
04c97488f9
Merge bodhi.local:/opt/local/work/tmp_merge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-12 21:06:51 +04:00
rburnett@bk-internal.mysql.com
6b399a498b
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-10 19:24:46 +02:00
cmiller@zippy.cornsilk.net
543fcde9b9
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
2006-08-09 22:23:41 -04:00
tnurnberg@salvation.intern.azundris.com
cbe81c301a
Bug#17926: mysql.exe crashes when ctrl-c is pressed in windows
...
SIGINT is handled in funny ways on windows, which could lead to problems when
Control-C was pressed in the client during a long-running query. Now Control-C
during a query aborts that query (by sending KILL to the server on a second
connexion), while Control-C outside of a running query terminates the client.
2006-08-10 03:46:46 +02:00
rburnett@bk-internal.mysql.com
86d74dc6dc
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-04 19:19:26 +02:00
rburnett@bk-internal.mysql.com
22c77e87a2
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-03 16:54:06 +02:00
msvensson@neptunus.(none)
10a7b8cedf
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-03 12:11:07 +02:00
msvensson@neptunus.(none)
61c5d97309
Remove double error printout in mysqldump
2006-08-03 12:09:22 +02:00
msvensson@neptunus.(none)
743948404a
Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21215
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-08-03 11:48:08 +02:00
tsmith@maint1.mysql.com
242ed711d2
5.0 -> 5.1 manual merge, part 1 of 3 (or more?)
2006-08-03 10:04:25 +02:00
msvensson@neptunus.(none)
7280f63100
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-03 09:32:58 +02:00
jimw@rama.(none)
9d67aacead
Merge rama.(none):/home/jimw/my/mysql-5.0-19147
...
into rama.(none):/home/jimw/my/mysql-5.0-16502
2006-08-02 19:52:11 -07:00
jimw@rama.(none)
95b3b2ea8d
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into rama.(none):/home/jimw/my/mysql-5.0-16502
2006-08-02 19:48:12 -07:00
cmiller@zippy.cornsilk.net
dd5eeaf676
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/m41-maint--07OBQ
2006-08-02 14:57:12 -04:00
kostja@bodhi.local
1b145118b9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
2006-08-02 21:54:10 +04:00
evgen@moonbone.local
83896aa8f6
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-08-02 18:11:59 +04:00
msvensson@neptunus.(none)
554b1f019b
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-02 15:45:03 +02:00
evgen@moonbone.local
7f0a080660
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-08-02 16:46:55 +04:00
kostja@bodhi.local
4bfc67fc3c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
2006-08-02 14:13:01 +04:00
holyfoot/hf@mysql.com/deer.(none)
6ebfbf561a
Merge bk@192.168.21.1:mysql-5.0-kt
...
into mysql.com:/home/hf/work/mysql-5.0.19452
2006-08-02 14:17:16 +05:00
msvensson@neptunus.(none)
31be565d2e
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-01 20:24:30 +02:00
evgen@sunlight.local
d4f92cbb5c
Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-08-01 20:52:21 +04:00
gkodinov/kgeorge@macbook.gmz
7b5e4ed026
Bug #20103 : Escaping with backslash does not work
...
- make the client to respect the server-side
no_backslash_escapes option and disable the
special meaning of backslash also at client side.
2006-08-01 11:05:54 +03:00
msvensson@neptunus.(none)
4131be777e
Bug#20439 mysqltest: remove unused options
...
-Remove leftovers of server_stop and server_start commands
2006-08-01 09:36:27 +02:00
msvensson@neptunus.(none)
39130d15eb
Merge neptunus.(none):/home/msvensson/mysql/my51-m-bug19535
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-01 09:33:00 +02:00
igreenhoe/greenman@anubis.greendragongames.com
940db2e976
Merge anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/mysql-4.1-maint
...
into anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-19364
2006-07-31 12:53:47 -07:00
msvensson@neptunus.(none)
bc0c886ded
Merge 192.168.0.20:mysql/bug21217/my51-bug21217
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-07-31 14:43:49 +02:00
msvensson@neptunus.(none)
5f78c492ec
Merge 192.168.0.20:mysql/bug21217/my50-bug21217
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-31 14:42:06 +02:00
msvensson@neptunus.(none)
dce84a7e05
Merge 192.168.0.20:mysql/bug21217/my41-bug21217
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-07-31 14:41:29 +02:00
msvensson@neptunus.(none)
2461e48698
Bug#21042 mysql client segfaults on importing a mysqldump export
...
- Use strmake, that will both protect the buffer and make sure it's terminated by a zero
- Add test case
2006-07-31 14:22:32 +02:00
msvensson@shellback.(none)
25a5678e4e
Merge shellback.(none):/home/msvensson/mysql/bug21217/my50-bug21217
...
into shellback.(none):/home/msvensson/mysql/bug21217/my51-bug21217
2006-07-30 19:35:29 +02:00
msvensson@shellback.(none)
5a710e8613
Merge shellback.(none):/home/msvensson/mysql/bug21217/my41-bug21217
...
into shellback.(none):/home/msvensson/mysql/bug21217/my50-bug21217
2006-07-30 19:33:48 +02:00
msvensson@shellback.(none)
eaae3b2d2b
BUG#21217 "mysqltest" client is inconsistent when to log a line number
...
- Init start_lineno to 0
2006-07-30 19:30:20 +02:00
jimw@rama.(none)
f7e19b40f3
Merge rama.(none):/home/jimw/my/tmp_merge
...
into rama.(none):/home/jimw/my/mysql-5.1-clean
2006-07-28 15:51:48 -07:00
msvensson@neptunus.(none)
155bf26d61
Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21042
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-27 12:31:50 +02:00
msvensson@neptunus.(none)
b3bbb3789e
Bug#21042 mysql client segfaults on importing a mysqldump export
...
- Use strxnmov to protect the "buff" variable from overrun
2006-07-27 12:28:49 +02:00
msvensson@neptunus.(none)
fdfad1d063
Bug#21297 rpl_insert fails randomly
...
- Add loop in mysqlslap that tries to connect up to 10 times if connect
in thread fails.
2006-07-27 10:54:04 +02:00