ramil/ram@mysql.com/myoffice.izhnet.ru
6e91557408
after merge fix.
2007-01-19 12:19:53 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
ce855aba98
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug22533/my41-bug22533
2007-01-19 09:12:52 +04:00
mtaylor@qualinost.(none)
fd75030f93
Added version script information to actually version the symbols.
2007-01-18 16:21:43 -08:00
malff/marcsql@weblab.(none)
436e1f591a
Bug#24562 (ALTER TABLE ... ORDER BY ... with complex expression asserts)
...
WL#3681 (ALTER TABLE ORDER BY)
Before this fix, the ALTER TABLE statement implemented an ORDER BY option
with the following characteristics :
1) The order by clause accepts a list of criteria, with optional ASC or
DESC keywords
2) Each criteria can be a general expression, involving operators,
native functions, stored functions, user defined functions, subselects ...
With this fix :
1) has been left unchanged, since it's a de-facto existing feature,
that was already present in the code base and partially covered in the test
suite. Code coverage for ASC and DESC was missing and has been improved.
2) has been changed to limit the kind of criteria that are permissible:
now only a column name is valid.
2007-01-18 16:53:49 -07:00
mtaylor@qualinost.(none)
7d2d130748
Adding support for versioned libndbclient.so. bug #13522
2007-01-18 13:30:01 -08:00
tsmith@siva.hindu.god
f5aab8b213
ndb_types.test: sleep a bit longer, to ensure that timestamp > @now
2007-01-18 13:26:26 -07:00
tsmith@siva.hindu.god
5817465426
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
2007-01-18 10:36:46 -07:00
tsmith@siva.hindu.god
6fd02a439f
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
2007-01-18 09:53:30 -07:00
tsmith@siva.hindu.god
eec44018b2
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40
2007-01-18 09:32:41 -07:00
tsmith@siva.hindu.god
2dc96063b4
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
2007-01-18 09:20:25 -07:00
tsmith@siva.hindu.god
4b3840612e
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
2007-01-18 08:52:45 -07:00
joerg/mysqldev@mysql.com/production.mysql.com
c3ab6de255
Raise version number after cloning 4.0.29
2007-01-18 16:41:32 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c91d648b73
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug22533/my41-bug22533
2007-01-18 17:17:03 +04:00
df@kahlann.erinye.com
f37e35419e
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2007-01-18 10:45:58 +01:00
tsmith@siva.hindu.god
d6d7385a18
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
2007-01-17 16:40:41 -07:00
tsmith@siva.hindu.god
018acedba7
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
2007-01-17 16:40:17 -07:00
tsmith@siva.hindu.god
fa927d7e05
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
2007-01-17 16:38:49 -07:00
cmiller@zippy.cornsilk.net
c9a0cccc23
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-01-17 13:34:36 -05:00
lars/lthalmann@mysql.com/dl145j.mysql.com
bbaf32754f
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
2007-01-17 19:28:55 +01:00
cmiller@zippy.cornsilk.net
332f9ff8b4
Bug#23721: compile fails: check-cpu mishandles cpu flags with \
...
hyphen in it (like ds-cpl).
convert illegal chars in cpu flags to '_' for variable assignment
2007-01-17 13:22:50 -05:00
istruewing@chilla.local
568106c297
Merge chilla.local:/home/mydev/mysql-4.1--team
...
into chilla.local:/home/mydev/mysql-4.1-bug24607
2007-01-17 14:52:36 +01:00
msvensson@pilot.mysql.com
bd3283936d
Merge 192.168.0.10:mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-01-17 13:58:42 +01:00
kostja@bodhi.local
6399db740e
Fix a failure of lowercase_tables2 test on powermacg5, introduced
...
by the patch for Bug#4968
2007-01-17 15:46:30 +03:00
msvensson@pilot.mysql.com
543bc0165f
Bug#21122 SHOW CREATE TABLE: directory output only sometimes
...
Bug #25000 myisam.test fails on 'pb-valgrind-*' Valgrind
- Move tests that need symlink to symlink.test
2007-01-17 12:22:00 +01:00
msvensson@pilot.mysql.com
248c768230
Cset exclude: msvensson@pilot.mysql.com|ChangeSet|20070117102733|42618
2007-01-17 12:12:24 +01:00
msvensson@pilot.mysql.com
29be5ce836
Bug#25505 Myisam library compiler error on Windows
2007-01-17 11:51:52 +01:00
msvensson@pilot.mysql.com
55ed38e533
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060825084614|09755
2007-01-17 11:27:33 +01:00
msvensson@pilot.mysql.com
8154355a07
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-01-17 11:13:03 +01:00
df@kahlann.erinye.com
06e3471a74
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2007-01-17 09:08:20 +01:00
kostja@bodhi.local
51a2f5153f
A fix for the broken 4.1-runtime tree.
2007-01-16 21:23:52 +03:00
svoj@mysql.com/june.mysql.com
c606e30f35
BUG#24855 - Crash mysqld 4.1.21 with corrupted tables
...
Accessing fixed record format table with crashed key definition results
in server/myisamchk segmentation fault.
This is fixed by refusing to open such tables. Affects MyISAM only.
No test case, since it requires crashed table.
2007-01-16 18:05:37 +04:00
msvensson@neptunus.(none)
f44d73a58d
Always use two masters for ndb tests
2007-01-16 09:35:14 +01:00
kostja@bodhi.local
d49ac4fbb7
A post-merge fix.
2007-01-15 23:25:16 +03:00
kostja@bodhi.local
d53072d190
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime
...
into bodhi.local:/opt/local/work/mysql-4.1-4968-to-push
2007-01-15 13:03:21 +03:00
df@kahlann.erinye.com
b818104d9e
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2007-01-15 10:45:31 +01:00
igor@olga.mysql.com
34eea49eb7
Fixed bug #24776 : an assertion abort in handler::ha_index_init
...
for queries using 'range checked for each record'.
The problem was fixed in 5.0 by the patch for bug 12291.
This patch down-ported the corresponding code from 5.0 into
QUICK_SELECT::init() and added a new test case.
2007-01-13 10:49:26 -08:00
kostja@bodhi.local
a7862496ce
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-4.1-runtime
2007-01-12 18:06:43 +03:00
joerg@trift2.
4ffada35bf
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into trift2.:/MySQL/M41/mysql-4.1
2007-01-12 14:40:28 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
22398faa91
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
2007-01-12 12:21:44 +01:00
df@kahlann.erinye.com
363bc66a7a
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2007-01-12 11:26:18 +01:00
joerg@trift2.
59e2133e00
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-01-12 10:17:39 +01:00
kostja@bodhi.local
dd03d51f22
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-4.1-runtime
2007-01-11 21:49:52 +03:00
joerg@trift2.
f3025c1122
Merge mysqldev@production.mysql.com:my/mysql-4.0-15815
...
into trift2.:/MySQL/M40/mysql-4.0
2007-01-11 19:17:27 +01:00
mysqldev@mysql.com/production.mysql.com
eb18787c81
Merge mysqldev@quadxeon:/benchmarks/ext3/TOSAVE/tsmith/bk/g40
...
into mysql.com:/data0/mysqldev/my/mysql-4.0-15815
2007-01-11 19:04:36 +01:00
joerg@trift2.
671028a44c
Merge trift2.:/MySQL/M40/clone-4.0
...
into trift2.:/MySQL/M40/mysql-4.0
2007-01-11 17:53:38 +01:00
thek@kpdesk.mysql.com
75d91dedac
Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2007-01-11 15:16:33 +01:00
thek@kpdesk.mysql.com
55558582ae
Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint
2007-01-11 15:14:34 +01:00
evgen@moonbone.local
fc0e206cb5
Bug#23409: Arguments of the ENCODE() and the DECODE() functions were not printed
...
correctly.
The Item_func::print method was used to print the Item_func_encode and the
Item_func_decode objects. The last argument to ENCODE and DECODE functions
is a plain C string and thus Item_func::print wasn't able to print it.
The print() method is added to the Item_func_encode class. It correctly
prints the Item_func_encode and the Item_func_decode objects.
2007-01-11 16:45:38 +03:00
evgen@moonbone.local
f35e10d43c
Merge fix for bug#17711
2007-01-11 16:20:08 +03:00
thek@kpdesk.mysql.com
1802d5aabb
Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2007-01-11 14:11:58 +01:00