brian@zim.(none)
deb37d146e
Period removal for warning message.
2006-08-15 01:20:34 -07:00
brian@zim.(none)
41f920b013
Merge zim.(none):/home/brian/mysql/dep-5.1
...
into zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-14 21:26:33 -07:00
brian@zim.(none)
16a5d97a5d
Merge fixes
2006-08-14 16:50:52 -07: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
brian@zim.(none)
545029df36
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-14 14:47:50 -07:00
brian@zim.(none)
4d7f7fb878
Removed warnings for Windows build issues. Edited Windows README to remove reference to BDB.
2006-08-14 14:45:48 -07:00
kostja@bodhi.local
1f80fb0453
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-14 22:38:22 +04:00
joerg@trift2.
a560c3ee1f
scripts/make_binary_distribution.sh : Drop the "max" server from 5.1 packages.
2006-08-14 19:56:41 +02:00
brian@zim.(none)
c43a332859
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/dep-5.0
2006-08-14 09:45:41 -07:00
kostja@bodhi.local
d03b39aaab
Fix a test case (proper clean up).
2006-08-14 19:18:33 +04:00
kostja@bodhi.local
14e237a957
Fix a test suite failure.
2006-08-14 19:05:35 +04:00
svoj@may.pils.ru
91e94d781f
Merge may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-5.0
2006-08-14 18:08:33 +05:00
kostja@bodhi.local
9b05865be4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-14 16:30:57 +04:00
kostja@bodhi.local
d4a7b82be9
Windows build fix: declare _db_set_ before it's used.
2006-08-14 16:15:08 +04:00
svoj@may.pils.ru
d4bdba176f
BUG#18874 - Setting myisam_repair_threads > 1, index cardinality always 1
...
Fixed by moving update_key_parts() down to be after write_index().
2006-08-14 17:05:02 +05:00
mats@romeo.(none)
7a1ccf90d4
Merge romeo.(none):/home/bkroot/mysql-5.1-new-maint
...
into romeo.(none):/home/bk/mytap-mysql-5.1-new-maint
2006-08-14 14:04:30 +02:00
mats@romeo.(none)
2c21e455d4
Fixing unit test execution script to work with AIX 5.2 and OS X machines.
...
These are using old version of the Test::Harness modules, so I resort
to a safer way of running executable files.
2006-08-14 13:52:05 +02:00
brian@zim.(none)
7429c871b9
Fix for bug#20648 We introduce a new field method for knowing "real size", and we now in archive null unused bits of a row to null before writing.
2006-08-14 03:29:17 -07:00
brian@zim.(none)
b93a5c5f04
Updated row result, and fix for Windows build.
2006-08-14 03:26:53 -07:00
kostja@bodhi.local
5dfdc8bfce
Manual merge 5.0->5.1. Post-merge fixes.
2006-08-14 13:27:11 +04:00
brian@zim.(none)
af443c2dd8
Fixed warning message breakage.
...
Fixed install breakage (my own fault)
Edited exampled cnf to remove bdb references.
2006-08-13 22:28:41 -07: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
baker/brian@zim.(none)
a06a582212
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-11 13:30:55 -07:00
jimw@rama.(none)
2e87907e40
Merge rama.(none):/home/jimw/my/mysql-5.0-21284
...
into rama.(none):/home/jimw/my/mysql-5.1-clean
2006-08-11 12:19:41 -07:00
cmiller@zippy.cornsilk.net
1257062ef4
German translations.
2006-08-11 09:27:44 -04:00
svoj@may.pils.ru
07a1ed651f
Extended a test case for bug#7391.
2006-08-11 14:41:07 +05:00
svoj@may.pils.ru
827164916c
Merge may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-5.0
2006-08-11 14:24:09 +05:00
baker/brian@zim.(none)
5a466cc48c
Removed bdb test cases.
2006-08-10 18:29:25 -07:00
pgalbraith/patg@govinda.patg.net
b2ce951b81
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
2006-08-10 15:31:44 -07:00
patg@govinda.patg.net
4371749996
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
2006-08-10 14:28:39 -07:00
brian@zim.(none)
e8289bfbc1
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-10 13:44:04 -07:00
cmiller@zippy.cornsilk.net
f6f7eb851e
Merge updates.
2006-08-10 12:39:18 -04:00
kroki/tomash@moonlight.intranet
b341356abd
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-runtine-merge
2006-08-10 16:16:16 +04:00
kroki/tomash@moonlight.intranet
aca2c3761a
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
2006-08-10 16:11:55 +04:00
kroki/tomash@moonlight.intranet
ed42379c72
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
2006-08-10 15:07:27 +04:00
serg@janus.mylan
069131e28a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into janus.mylan:/usr/home/serg/Abk/m51
2006-08-10 12:39:59 +02:00
andrey@example.com
81efea724e
revert part of the code
...
how did it get in?!? (it's only in local csets so no other tree is affected)
2006-08-10 12:26:43 +02:00
andrey@example.com
eba9109225
after merge update
2006-08-10 11:52:34 +02:00
serg@janus.mylan
7d77c53038
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/m51
2006-08-10 11:04:09 +02:00
brian@zim.(none)
65e9ae97b0
This is the second patch for bdb removeal. This takes care of all options and variables that rely on bdb.
2006-08-10 01:50:37 -07:00
kroki/tomash@moonlight.intranet
f6dda7f1e1
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
2006-08-10 12:10:48 +04:00
cmiller@zippy.cornsilk.net
364dfae629
Removed Iggy's accidentally-added files.
2006-08-10 01:02:31 -04: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
brian@zim.(none)
c37e1b4839
First stage removeal of BDB.
2006-08-09 17:33:08 -07:00
evgen@moonbone.local
2e7f47c6f8
sql_base.cc, table.cc:
...
After merge fix
2006-08-10 00:37:08 +04:00
andrey@lmy004.
9a325ac786
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into lmy004.:/work/mysql-5.1-runtime
2006-08-09 17:19:39 +02:00
andrey@lmy004.
76ff7fb78f
Fix for bug#20701 BINARY keyword should be forbidden in stored routines
...
create function func() returns char(10) binary ...
is no more possible. This will be reenabled when
bug 2676 "DECLARE can't have COLLATE clause in stored procedure"
is fixed.
Fix after 2nd review
2006-08-09 17:07:59 +02:00
kroki/tomash@moonlight.intranet
e79876362e
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-rt-merge
2006-08-09 16:42:21 +04:00
kroki/tomash@moonlight.intranet
216ba85296
Post-merge fix.
2006-08-09 16:37:26 +04:00
kroki/tomash@moonlight.intranet
5c272816ca
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
2006-08-09 13:37:20 +04:00