konstantin@mysql.com
40b368af16
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/opt/local/work/mysql-4.1-root
2006-03-04 22:33:19 +03:00
dlenev@mysql.com
efe0900669
Fix for bug #17866 "Problem with renaming table with triggers with fully
...
qualified subject table" which was introduced during work on bug #13525
"Rename table does not keep info of triggers".
The bug was caused by the fact that during reconstruction of CREATE TRIGGER
statement stored in .TRG file which happened during RENAME TABLE we damaged
trigger definition in case when it contained fully qualified name of subject
table (see comment for sql_yacc.yy for more info).
2006-03-04 16:55:06 +03:00
ingo@mysql.com
c5a638cee0
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug11527
2006-03-04 14:06:52 +01:00
ingo@mysql.com
ec45217cc4
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug11527
2006-03-04 11:40:54 +01:00
petr@mysql.com
965fd06afa
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/cps/mysql/devel/5.1-cleanup
2006-03-04 11:52:02 +03:00
petr@mysql.com
0a861ec8c5
Remove unused thd->options's flag -- OPTION_UPDATE_LOG
...
The update log itself was removed back in 5.0. Recommit
with post-review fixes.
2006-03-04 11:20:56 +03:00
reggie@big_geek.
653596ce1f
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into big_geek.:C:/Work/mysql/mysql-5.1
2006-03-03 22:09:20 -06:00
reggie@big_geek.
3bcc20950d
Some cmake script fixes
2006-03-03 22:05:40 -06:00
cmiller@zippy.(none)
e5e1760292
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr
2006-03-03 16:27:43 -05:00
cmiller@zippy.(none)
599c710a5b
Bug#16859 involves truncating column data at NUL characters. Instead, the
...
client will now substitute spaces for NULs, so that the grid isn't messed up
due to silently consumed NULs and that the full field is shown.
2006-03-03 16:26:38 -05:00
paul@snake-hub.snake.net
33dfa2a91e
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-03-03 14:59:29 -06:00
paul@snake-hub.snake.net
a690cbf326
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
2006-03-03 14:50:41 -06:00
paul@snake-hub.snake.net
53ea1584bc
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1-clone
2006-03-03 14:41:55 -06:00
paul@snake-hub.snake.net
1442be9798
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-clone
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
2006-03-03 14:37:43 -06:00
paul@snake-hub.snake.net
f3cf52832d
mysqltest.c:
...
Typos.
2006-03-03 14:34:30 -06:00
paul@snake-hub.snake.net
f3c7e2d3ed
mysqltest.c:
...
Better fix for do_sleep().
2006-03-03 13:57:49 -06:00
kent@mysql.com
2ffb679a27
mysql.spec.sh:
...
Use installed libz.a to avoid hard to solve static linking problems
2006-03-03 20:30:28 +01:00
pem@mysql.com
2b6f510350
Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0
2006-03-03 19:18:17 +01:00
paul@snake-hub.snake.net
6fa488114d
mysql-stress-test.pl, README.stress:
...
Revise stress-test README
2006-03-03 12:15:01 -06:00
pem@mysql.com
b66567f619
Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-release
2006-03-03 18:51:13 +01:00
ingo@mysql.com
b9ed183a8d
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug11527
2006-03-03 16:29:42 +01:00
msvensson@neptunus.(none)
3c2221b54d
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-03 15:44:38 +01:00
reggie@linux.site
eb527e895e
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into linux.site:/home/reggie/work/mysql-5.1
2006-03-03 08:44:03 -06:00
ingo@mysql.com
7d2af33057
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug11527
2006-03-03 15:44:02 +01:00
msvensson@neptunus.(none)
b56857d152
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-03 15:13:10 +01:00
msvensson@neptunus.(none)
4e55197ce3
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-03 15:02:46 +01:00
pem@mysql.com
9e001880df
Merge mysql.com:/extern/mysql/bk/mysql-5.1-new
...
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-03 15:02:37 +01:00
msvensson@neptunus.(none)
21cc7c9555
Windows fixes
...
- Use pipes "|"
- Improved system command, create a temporary .sh faile that is executed with cygwins sh(bash)
This makes the Windows version behave exactly as the Lunix version(well almost...)
- Give unix path to DBUG, trace files is no produced if running ./mysql-test-run.pl --debug"
2006-03-03 14:55:05 +01:00
ramil@mysql.com
f864fc7ee6
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2006-03-03 17:22:20 +04:00
bar@mysql.com
7dc12415e9
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b16316
2006-03-03 17:00:03 +04:00
msvensson@neptunus.(none)
e2827d97ea
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-03 13:33:01 +01:00
pem@mysql.com
48ca79adac
Merge mysql.com:/extern/mysql/bk/mysql-5.1-new
...
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-03 13:25:02 +01:00
joerg@debian.(none)
e5b149d1e7
Merge joerg@trift2:/M50/patch-17595 into debian.(none):/M50/clone-5.0
2006-03-03 12:50:15 +01:00
gluh@mysql.com
ab67605976
Merge mysql.com:/home/gluh/MySQL/Merge/mysql-5.0-release
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-03 15:39:38 +04:00
ramil@mysql.com
d47b351204
Merge mysql.com:/usr/home/ram/work/mysql-4.1
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2006-03-03 15:32:00 +04:00
gluh@eagle.intranet.mysql.r18.ru
f3e993d9a6
Fix for bug#17826 'type_decimal' fails with ps-protocol
...
removed unnecessary calculation of cache value
otherwise Join::preapre tries to calculate
undefined values(filed values)
2006-03-03 15:29:39 +04:00
pem@mysql.com
015ab71a50
Merge mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0
...
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-03 12:03:27 +01:00
msvensson@neptunus.(none)
5b9b34bd85
Bug#17728 tests that fails are: ndb_gis rpl_ndb_multi_update2
...
- Fix for ndb_gis to run with all types of logging
2006-03-03 11:52:52 +01:00
pekka@mysql.com
dd24ab56d5
ndb - blob tables vs dict cache : patch 2 - bug#17761 (maybe)
2006-03-03 11:16:56 +01:00
ingo@mysql.com
85ae00c794
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug11527
2006-03-03 09:08:44 +01:00
ramil@mysql.com
1a07140515
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b17615
2006-03-03 09:35:25 +04:00
ramil@mysql.com
1301484679
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b13659
2006-03-03 09:34:40 +04:00
kent@mysql.com
7ae10acbc4
mysql.spec.sh:
...
Don't create empty embedded RPM, bug#15769
2006-03-03 03:27:27 +01:00
kent@mysql.com
32b003e64d
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2006-03-03 02:55:51 +01:00
cmiller@zippy.(none)
c672c119e3
Expanding a binary field should result in 0x00-filled positions, not 0x20
...
(ASCII space). For Bug#16857.
2006-03-02 20:49:10 -05:00
kent@mysql.com
5557a442e9
Makefile.am:
...
Use libtool convenience lib, to access get_password object correctly, bug#17155
2006-03-03 02:46:47 +01:00
cmiller@zippy.(none)
5147bb8e9b
Expanding a binary field should result in 0x00-filled positions, not 0x20
...
(ASCII space). For Bug#16857.
2006-03-02 19:59:49 -05:00
andrey@lmy004.
c7837821e1
update test
2006-03-02 23:40:51 +01:00
kent@mysql.com
550e73cc6e
mysql-test-run.pl:
...
Try find in order 'mysqld-nt', 'mysqld', 'mysqld-debug' and 'mysqld-max'
mysqld_safe.sh:
Don't try 'mysqld-max' before 'mysqld' if no server given, bug#17861
2006-03-02 22:53:38 +01:00
andrey@lmy004.
e889e85a80
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug17494
2006-03-02 21:02:00 +01:00