msvensson@neptunus.(none)
8fe764fbb2
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-04-11 09:11:36 +02:00
igor@rurik.mysql.com
e9ef9ef6da
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into rurik.mysql.com:/home/igor/mysql-5.1
2006-04-10 18:17:01 -07:00
brian@zim.(none)
55e9ec99e5
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-04-10 17:48:20 -07:00
igor@rurik.mysql.com
74ab3de265
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into rurik.mysql.com:/home/igor/mysql-5.1
2006-04-10 17:48:19 -07:00
brian@zim.(none)
eaf850ef5b
Drop a number of OS2 specific files.
2006-04-10 17:48:19 -07:00
kent@mysql.com
691822a929
mysql_upgrade.c:
...
No declarations after first expression in block
2006-04-11 02:48:19 +02:00
kent@mysql.com
8f635a9789
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-04-11 02:48:18 +02:00
igor@rurik.mysql.com
0f2a1f0db8
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-10 17:48:17 -07:00
kent@mysql.com
8476262472
Merge
2006-04-11 02:48:17 +02:00
reggie@big_geek.
8b7526db77
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into big_geek.:C:/Work/mysql/mysql-5.1-test
2006-04-10 19:48:16 -05:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
0f9676426c
manual merge
2006-04-10 20:48:15 -04:00
igor@rurik.mysql.com
e2feeb88f9
Made the test case for bug #15917 independent on platforms.
2006-04-10 14:14:20 -07:00
reggie@big_geek.
ed6ff9cd40
fix cmake generation error
2006-04-10 16:06:17 -05:00
kent@mysql.com
dbc797971e
disabled.def:
...
Disabled randomly failing tests
2006-04-10 22:51:17 +02:00
igor@rurik.mysql.com
406b29b6e0
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-10 13:04:25 -07:00
gluh@mysql.com
23c05e1361
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-04-11 00:32:36 +05:00
gluh@mysql.com
b70af5df7c
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-04-11 00:32:35 +05:00
lars@mysql.com
ac72a7ed48
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new
2006-04-10 21:32:35 +02:00
holyfoot@mysql.com
52f81631e6
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/hf/work/mysql-5.1.upgrd
2006-04-11 00:32:34 +05:00
aivanov@mysql.com
b43493bbfc
Merge mysql.com:/home/alexi/bugs/mysql-5.0-temp
...
into mysql.com:/home/alexi/bugs/mysql-5.1-temp
2006-04-10 23:32:33 +04:00
knielsen@mysql.com
030c170550
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/mysql/mysql-5.0-tmp
2006-04-10 20:48:09 +02:00
aivanov@mysql.com
31727db005
Merge mysql.com:/home/alexi/bugs/mysql-5.0-15868
...
into mysql.com:/home/alexi/bugs/mysql-5.0-15868-work
2006-04-10 22:48:08 +04:00
aivanov@mysql.com
6ad6cda2ca
Fixed test case result (after BUG#15868 fix).
2006-04-10 22:44:01 +04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
bb88aeec14
Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17946
...
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug15561
2006-04-10 13:12:28 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
61318c3b32
BUG*#17946: New test case for already fixed bug (Problem with LIKE searches for partitioned tables)
...
Added new test case for bug 17946
2006-04-10 13:07:50 -04:00
msvensson@neptunus.(none)
e805afde11
Step 1 in removing mysql-test-run.sh from 5.1 and up
2006-04-10 18:08:54 +02:00
knielsen@mysql.com
4088329ba0
Merge mysql.com:/usr/local/mysql/mysql-5.0-fixcast
...
into mysql.com:/usr/local/mysql/mysql-5.0-tmp
2006-04-10 17:58:22 +02:00
knielsen@mysql.com
1f9d96430d
Merge mysql.com:/usr/local/mysql/mysql-4.1-vgfix
...
into mysql.com:/usr/local/mysql/mysql-5.0-tmp
2006-04-10 17:58:21 +02:00
aivanov@mysql.com
aeeb19920d
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/bugs/mysql-5.0-15868
2006-04-10 19:58:20 +04:00
holyfoot@deer.(none)
b5afca05a4
WL#2645 (mysql_upgrade tool)
2006-04-10 20:54:43 +05:00
gluh@eagle.intranet.mysql.r18.ru
2c1043c9e0
Fix for bug#18753 Partitions: auto_increment fails
...
Current auto increment value is placed in partition in which latest
record was saved. So to get auto_increment they have to scan
all partitions and return max value.
2006-04-10 20:54:42 +05:00
lars@mysql.com
33c3e641be
Updated disable.def file with BUG numbers, time of disable and disabler
2006-04-10 17:54:42 +02:00
holyfoot@mysql.com
a5d18bc8ab
Merging
2006-04-10 20:54:42 +05:00
aivanov@mysql.com
d70035ca8b
Merge mysql.com:/home/alexi/bugs/mysql-5.0-15868-work
...
into mysql.com:/home/alexi/bugs/mysql-5.1-15868
Null-merge
2006-04-10 19:54:41 +04:00
aivanov@mysql.com
bb94bb30d0
Fixed BUG#15868: InnoDB hangs under 200 threads making INSERTs: 'thread thrashing'.
...
Applied changes due Heikki Tuuri.
2006-04-10 19:47:41 +04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
d3e2d17f07
Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
...
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug15561
2006-04-10 10:52:25 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
50da59e340
Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18423
...
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug15561
2006-04-10 10:51:21 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
4414b24dbd
BUG#18423: Added test case for this bug that was already fixed (was issue with hash partitions not showing all rows in BETWEEN range
...
Added test case for bug 18423
2006-04-10 10:44:47 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
b57664b7cf
BUG#18752: Added test case for SHOW CREATE TABLE not showing NULL values properly in bug already fixed
...
Added new test case for bug 18752 (bug already fixed by previous patch)
2006-04-10 10:18:57 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
6e16cfa01d
BUG#15561: Possible to strange things with partitions defined although no partition support compiled in
...
Added an #ifdef to ensure we get syntax error when using partitioned synytax and no partition support is compiled in.
2006-04-10 10:00:08 -04:00
msvensson@neptunus.(none)
5770973b72
Merge 192.168.0.20:mysql/bug15069/my51-bug15069
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-04-10 15:14:47 +02:00
msvensson@shellback.(none)
1e2de60439
Merge shellback.(none):/home/msvensson/mysql/bug15069/my50-bug15069
...
into shellback.(none):/home/msvensson/mysql/bug15069/my51-bug15069
2006-04-10 15:13:11 +02:00
msvensson@shellback.(none)
475e1f6a53
Bug#15069 [patch] my_print_defaults does'nt care --sysconfdir
...
- Grab the path from "configure --sysconfdir=<path>" and set it as
the first place to look for my.cnf files
Do this both in Makefiles for libmysql and mysys
- Patch provided by Francesco Riosa. Thank you!
2006-04-10 15:11:37 +02:00
kent@mysql.com
41923d3bb1
mysql-test-run.pl:
...
Added --ndbcluster_port for backward compatibility
make_win_src_distribution.sh:
Updated to reflect 5.1 changes
2006-04-10 14:15:02 +02:00
msvensson@neptunus.(none)
24a6dd64b5
Update implementation of new function 'mysql_get_ssl_cipher' after review
2006-04-10 12:23:20 +02:00
jonas@perch.ndb.mysql.com
e4e61b091a
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-10 09:56:57 +02:00
knielsen@mysql.com
b9d427ca27
Fix test case 'cast' on Windows, different floating point output format.
2006-04-10 09:31:46 +02:00
jonas@perch.ndb.mysql.com
7e0733fedc
Merge perch.ndb.mysql.com:/home/jonas/src/50-jonas
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-10 08:29:24 +02:00
jonas@perch.ndb.mysql.com
5b38711760
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-10 08:27:59 +02:00
brian@zim.(none)
ba5d08f340
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-04-09 20:07:42 -07:00