Commit graph

27636 commits

Author SHA1 Message Date
petr@mysql.com
0f373f9501 Merge mysql.com:/home/cps/mysql/trees/mysql-4.1
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-11-08 01:27:15 +03:00
petr@mysql.com
03674968b3 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/cps/mysql/trees/mysql-4.1
2005-11-08 01:00:15 +03:00
guilhem@mysql.com
ef415ceb14 Fix for BUG#14703 "Valgrind error when inserting 0 into a BIT column (like in type_bit.test)":
test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).
I wrote to the Valgrind authors in case this is something fixable in Valgrind (normally the
decision to issue a warning is based on the simulated CPU condition code, which should not be undefined here).
2005-11-07 16:18:46 +01:00
guilhem@mysql.com
517e51f1ed Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/mysql_src/mysql-5.0
2005-11-07 13:04:27 +01:00
igor@rurik.mysql.com
60a4b4fb16 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-11-05 22:45:54 -08:00
igor@rurik.mysql.com
0960f5fedc Post review fixes. 2005-11-05 22:41:36 -08:00
petr@mysql.com
038b300753 Fix Bug#14672 Bug in deletion 2005-11-06 02:11:12 +03:00
petr@mysql.com
a1f56ea5a6 Fix Bug#13894 Server crashes on update of CSV table 2005-11-05 15:08:15 +03:00
sergefp@mysql.com
33026e5237 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-05 05:46:41 +03:00
kent@mysql.com
79aaf0754d mysql.spec.sh:
Always use bundled zlib
2005-11-05 01:44:35 +01:00
igor@rurik.mysql.com
84ad20364d Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-11-04 15:03:29 -08:00
monty@mysql.com
75f09a9819 Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-04 15:44:21 +02:00
petr@mysql.com
f42668e88e Merge mysql.com:/home/cps/mysql/trees/mysql-4.1
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-11-04 16:44:20 +03:00
petr@mysql.com
085b48427d fix --ansi --pedantic compilation failure 2005-11-04 16:17:43 +03:00
monty@mysql.com
1e2191c47a Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-04 15:12:23 +02:00
monty@mysql.com
303f6b4a7a Reorder struct elements to be more optimal for 64 bit computers
(Main reason for reordering was to get rid of compiler warnings for order of element initialization)
2005-11-04 15:12:22 +02:00
msvensson@neptunus.(none)
10edbfe206 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-04 12:09:46 +01:00
guilhem@mysql.com
cb1d21eeba sql_parse.cc:
SCCS merged
2005-11-04 10:54:51 +01:00
msvensson@neptunus.(none)
303d4bf1e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-04 09:23:09 +01:00
monty@mysql.com
b90fa0185b Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-04 10:03:32 +02:00
monty@mysql.com
2d39028ef2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-11-04 10:03:31 +02:00
monty@mysql.com
89fdc4f49e DROP created procedures
(Caused sp-security to fail)
2005-11-04 10:02:43 +02:00
jimw@mysql.com
5764170898 Merge mysql.com:/home/jimw/my/mysql-5.0-9815
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-03 17:24:24 -08:00
monty@mysql.com
18a87b9546 Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-03 22:42:26 +02:00
monty@mysql.com
90ca9150a4 Fixes during review of new code
Destroy LOCK_uuid_generator
2005-11-03 22:42:25 +02:00
sergefp@mysql.com
7dfca7b9ff Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-03 22:35:18 +03:00
jani@hasky.mysql.fi
c01c714161 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hasky.mysql.fi:/home/jani/mysql-5.0
2005-11-03 21:17:23 +02:00
jani@ua141d10.elisa.omakaista.fi
fcea95c2e5 Disabled ps_protocol for two statements. 2005-11-03 20:29:21 +02:00
rburnet@fedora.(none)
f8f35a7b00 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into  fedora.(none):/home/reggie/bk/mysql-5.0-new
2005-11-03 11:01:28 -06:00
jani@ua141d10.elisa.omakaista.fi
c4aa14fad7 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-11-03 19:01:28 +02:00
holyfoot@deer.(none)
a6ada95d1e test enabled 2005-11-03 21:01:27 +04:00
holyfoot@mysql.com
1d8243c8ed Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 20:58:43 +04:00
holyfoot@mysql.com
a8b38c1d5a Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 19:47:08 +04:00
jani@ua141d10.elisa.omakaista.fi
00aa48c75d Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-11-03 17:44:57 +02:00
jani@ua141d10.elisa.omakaista.fi
2940a338c5 Disabled a test temporarily. 2005-11-03 17:39:40 +02:00
msvensson@neptunus.(none)
1754ea8943 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 16:13:20 +01:00
jani@ua141d10.elisa.omakaista.fi
0f83ba137a Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-11-03 16:43:05 +02:00
jani@ua141d10.elisa.omakaista.fi
6c8bda306d Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 16:43:04 +02:00
evgen@moonbone.local
e92452c8ed opt_range.cc:
Additional fix for bug#14093
2005-11-03 17:43:03 +03:00
jani@ua141d10.elisa.omakaista.fi
0ee589b4d6 Changes in get_table_type() and mysql_frm_type(). The main problem was
that in mysql_rm_table_part2_with_lock() previously we needed to open
same file twice. Now once is enough.
2005-11-03 16:10:11 +02:00
msvensson@neptunus.(none)
cbefd0d7a5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 15:02:16 +01:00
jani@ua141d10.elisa.omakaista.fi
cbf8a00c0b Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 15:39:55 +02:00
sergefp@mysql.com
0cdaa61a8f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-03 16:23:47 +03:00
msvensson@neptunus.(none)
46827ad57b Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 14:23:42 +01:00
sergefp@mysql.com
749d78fcd4 Merge mysql.com:/home/psergey/mysql-5.0-bug14026-r2
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-03 16:21:21 +03:00
jani@ua141d10.elisa.omakaista.fi
3d7d8af3aa Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 15:01:04 +02:00
jani@ua141d10.elisa.omakaista.fi
c66f53e277 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 14:48:09 +02:00
konstantin@mysql.com
d702915356 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-14210
2005-11-03 15:24:55 +03:00
holyfoot@mysql.com
bac54a7774 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 16:19:46 +04:00
holyfoot@deer.(none)
e529fdc5ee Merging 2005-11-03 16:17:11 +04:00