mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
53957 commits 2793 branches 343 tags 1.7 GiB
Commit graph

53957 commits

This branch
This branch
All branches
Author SHA1 Message Date
hhunger@hh-nb.hungers
a14e5f3707 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
 2008-04-16 16:49:49 +02:00
hhunger@hh-nb.hungers
9c925be163 fifth set of fixes to bug#35988. 2008-04-16 16:32:33 +02:00
hhunger@hh-nb.hungers
b7436cb905 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
 2008-04-16 10:50:09 +02:00
hhunger@hh-nb.hungers
eee7bdc51a fourth set of fixes for bug#35988. 2008-04-16 10:23:07 +02:00
hhunger@hh-nb.hungers
f6aa788f26 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
 2008-04-15 15:56:11 +02:00
hhunger@hh-nb.hungers
679b907964 Third set of fixes for bug#35988. 2008-04-15 15:44:11 +02:00
hhunger@hh-nb.hungers
63b0997fd7 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
 2008-04-14 17:31:15 +02:00
hhunger@hh-nb.hungers
913b7b8030 Second set of fixes for bug#35988. 2008-04-14 17:21:18 +02:00
hhunger@hh-nb.hungers
ea349ae170 Merge hh-nb.hungers:/work/merge/mysql-5.1-build 
into  hh-nb.hungers:/work/merge/mysql-5.1-wl4288
 2008-04-11 22:16:41 +02:00
hhunger@hh-nb.hungers
3e3b797d0a Fixes of system variable test programs for bug#35988. 2008-04-11 21:59:33 +02:00
cmiller@zippy.cornsilk.net
ac2d693514 Fix merge problem. 2008-04-10 23:27:24 -04:00
cmiller@zippy.cornsilk.net
2f7bdf8427 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-10 17:58:58 -04:00
cmiller@zippy.cornsilk.net
c27dd4372c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-10 17:48:33 -04:00
cmiller@zippy.cornsilk.net
82d8a99c05 Fix mismerge. 2008-04-10 15:55:37 -04:00
hhunger@hh-nb.hungers
88451eacfd Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
 2008-04-10 18:32:37 +02:00
hhunger@hh-nb.hungers
afd90d6166 System variable tests delivered by Folio3 (see WL4288). 2008-04-10 15:14:28 +02:00
cmiller@zippy.cornsilk.net
7a4136604a Error message changed across versions. 2008-04-09 21:19:41 -04:00
cmiller@zippy.cornsilk.net
53980960ea Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-09 21:03:14 -04:00
cmiller@zippy.cornsilk.net
ff37cb0b51 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my51-bug15776-encore 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-09 20:38:32 -04:00
cmiller@zippy.cornsilk.net
3c6591ad8f Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my50-bug15776-encore 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-04-09 20:34:38 -04:00
cmiller@zippy.cornsilk.net
59fc28cfc4 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my51-bug15776-encore
 2008-04-09 18:24:50 -04:00
cmiller@zippy.cornsilk.net
cc2f6266c3 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
 2008-04-09 18:09:42 -04:00
cmiller@zippy.cornsilk.net
02e6c83950 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my50-bug15776-encore
 2008-04-09 17:14:10 -04:00
cmiller@zippy.cornsilk.net
b506166a0c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-04-09 12:27:51 -04:00
cmiller@zippy.cornsilk.net
3e2457b71a Follow-up to B-g#15776, test failures on 64-bit linux. 
Make maximum blob size to be 2**32-1, regardless of word size.

Fix failure of timestamp with size of 2**31-1.  The method of
rounding up to the nearest even number would overflow.
 2008-04-09 12:27:30 -04:00
mleich@five.local.lan
756725ab93 Merge five.local.lan:/work/merge/mysql-5.1-funcs_1 
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
 2008-04-09 16:05:58 +02:00
mleich@five.local.lan
963bb655c6 Additional tests inspired by Bug 
#12713 Error in a stored function called from a
          SELECT doesn't cause ROLLBACK of statem
 2008-04-09 15:56:25 +02:00
joerg@trift2.
0e6f1a731f Merge trift2.:/MySQL/M51/push-5.1 
into  trift2.:/MySQL/M51/work-5.1
 2008-04-05 13:37:05 +02:00
joerg@trift2.
fa63d5d165 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-05 12:51:38 +02:00
joerg@trift2.
cca2a8ec42 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/tmp-5.1
 2008-04-04 20:03:24 +02:00
joerg@trift2.
0d0b67d270 Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/tmp-5.1

Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.
 2008-04-04 19:52:48 +02:00
joerg@trift2.
a5a1fef394 Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-04 19:30:52 +02:00
joerg@trift2.
2092e0c004 Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/tmp-5.1
 2008-04-04 19:25:39 +02:00
mleich@five.local.lan
5b6e85157b Merge five.local.lan:/work/merge/mysql-5.1-funcs_1 
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
 2008-04-04 18:31:02 +02:00
mleich@five.local.lan
c780a0879a Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 
into  five.local.lan:/work/merge/mysql-5.1-funcs_1
 2008-04-04 18:27:37 +02:00
mleich@five.local.lan
71dd9bda70 Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
 2008-04-04 18:02:55 +02:00
mleich@five.local.lan
7498f9e6b8 Backport of fix made in 5.1 to 5.0 
mysql-test/Makefile.am   :    Fix a copy-paste error ...
 2008-04-04 17:41:14 +02:00
mleich@five.local.lan
c7efce7e3b Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean 
into  five.local.lan:/work/merge/mysql-5.0-build
 2008-04-04 14:51:43 +02:00
mleich@five.local.lan
40092a7932 Merge five.local.lan:/work/trees/mysql-5.1-build-src-clean 
into  five.local.lan:/work/merge/mysql-5.1-build
 2008-04-04 14:50:46 +02:00
joerg@trift2.
a1173ad61b mysql-test/Makefile.am : Fix a copy-paste error ... 2008-04-04 13:21:40 +02:00
joerg@trift2.
27e226c69f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-04 12:12:03 +02:00
joerg@trift2.
e0b54b4817 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-04 10:26:41 +02:00
joerg@trift-lap.fambruehe
b7360593f1 Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2008-04-03 20:58:22 +02:00
joerg@trift-lap.fambruehe
be2080f917 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2008-04-03 20:23:07 +02:00
cmiller@zippy.cornsilk.net
7b77e36909 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-03 13:21:02 -04:00
cmiller@zippy.cornsilk.net
61a528c0b2 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-04-03 13:19:55 -04:00
cmiller@zippy.cornsilk.net
7e78633f81 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294
 2008-04-03 13:14:57 -04:00
joerg@trift-lap.fambruehe
e9a27950ce Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2008-04-03 18:51:00 +02:00
cmiller@zippy.cornsilk.net
9ff7a0cedc Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3 
When linking with some external programs, "multiple definition 
of `init_time'"

Rename init_time() to my_init_time() to avoid collision with other
libraries (particularly libmng).
 2008-04-03 11:32:00 -04:00
cmiller@zippy.cornsilk.net
bb7d01f73d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-03 11:30:38 -04:00