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
44258 commits 2793 branches 343 tags 1.7 GiB
Commit graph

44258 commits

This branch
This branch
All branches
Author SHA1 Message Date
iggy@recycle.(none)
0d3aefcdf4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  recycle.(none):/src/bug23736/my51-bug23736
 2007-03-21 13:39:08 -04:00
msvensson@pilot.blaudden
a0c2fae01f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-21 14:34:25 +01:00
msvensson@pilot.blaudden
31b2f339a0 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-21 14:30:47 +01:00
msvensson@pilot.blaudden
7c5df4d35b Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-21 14:24:50 +01:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
79216dad87 Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-build 
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
 2007-03-21 13:16:03 +02:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
ac1c81ddcf Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug26079_binlog_max_innodb 
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
 2007-03-21 13:14:12 +02:00
holyfoot/abotchkov@mysql.com/bk-internal.mysql.com
9d4a0118d8 mysqlbinlog-cp932.test: 
merging
 2007-03-21 09:28:26 +01:00
tsmith@quadxeon.mysql.com
2553b47663 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
 2007-03-21 01:07:44 +01:00
tsmith@quadxeon.mysql.com
1907df76f8 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
 2007-03-21 01:02:23 +01:00
kent@mysql.com/kent-amd64.(none)
031fd30def Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-release 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-21 00:53:39 +01:00
msvensson@pilot.blaudden
3bf2a52225 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-20 23:53:25 +01:00
tsmith@quadxeon.mysql.com
af19690659 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
 2007-03-20 21:49:58 +01:00
tsmith@quadxeon.mysql.com
cc4ea8bba8 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
 2007-03-20 21:35:11 +01:00
tsmith@quadxeon.mysql.com
9167aabaa3 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
 2007-03-20 21:27:45 +01:00
msvensson@pilot.blaudden
8f3d9cb415 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-20 21:24:20 +01:00
joerg@trift2.
d21bf44517 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/test-help-5.1
 2007-03-20 21:23:23 +01:00
tsmith@quadxeon.mysql.com
7018d9c5aa Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
 2007-03-20 21:12:46 +01:00
joerg@trift2.
16ec3cb361 Merge trift2.:/MySQL/M50/test-help-5.0 
into  trift2.:/MySQL/M51/test-help-5.1
 2007-03-20 21:05:57 +01:00
tsmith@quadxeon.mysql.com
2250d1a752 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
 2007-03-20 21:05:48 +01:00
tsmith@quadxeon.mysql.com
fb5e4d3221 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
 2007-03-20 21:02:03 +01:00
iggy@recycle.(none)
13398ccb5a Post Merge Fix. 2007-03-20 16:01:38 -04:00
tsmith@quadxeon.mysql.com
2670f149d0 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
 2007-03-20 20:59:41 +01:00
joerg@trift2.
602ed0a945 Merge trift2.:/MySQL/M41/test-help-4.1 
into  trift2.:/MySQL/M50/test-help-5.0
 2007-03-20 19:52:40 +01:00
msvensson@pilot.blaudden
5b62c51a05 Remove the variables for long gone disable_ps_warnings 2007-03-20 19:43:36 +01:00
joerg@trift2.
69a2dcda37 Test "help": 
Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.

Will be merged up to 5.0 where it is needed for 5.0.38.
 2007-03-20 19:36:11 +01:00
joerg@trift2.
54dd7a5112 Merge trift2.:/MySQL/M41/test-help-4.1 
into  trift2.:/MySQL/M50/test-help-5.0
 2007-03-20 19:29:46 +01:00
kent@mysql.com/kent-amd64.(none)
0e84886d61 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-20 19:23:20 +01:00
joerg@trift2.
86483de2e5 Test "help": 
Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.

Will be merged up to 5.0 where it is needed for 5.0.38.
 2007-03-20 19:19:17 +01:00
mtaylor@qualinost.(none)
1f1bb54c19 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
 2007-03-20 11:18:40 -07:00
tsmith@quadxeon.mysql.com
21ed11cda2 Bug #27231: Server crash when dumping into outfile with long FIELDS ENCLOSED BY option 
- Problem: data separators were copied to a fixed-size buffer
  on the stack; memcpy was used, without bounds checking; a
  server crash could result if long FIELDS ENCLOSED BY, etc.,
  was given
- Fix: write the separators directly, instead of copying to
  a buffer first (in select_export::send_data())
 2007-03-20 19:09:28 +01:00
kent@kent-amd64.(none)
240bbc6d29 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-20 19:04:02 +01:00
mtaylor@qualinost.(none)
02fc829ff6 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-init 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2007-03-20 10:58:25 -07:00
msvensson@pilot.blaudden
273eb9bd72 my_print_default does not need to be linked with odbc32.lib(and friends) 2007-03-20 18:37:09 +01:00
kent@mysql.com/kent-amd64.(none)
39e9a2d316 echo.c: 
Corrected GPL to be version 2 only
 2007-03-20 18:31:49 +01:00
joerg@trift2.
b57f37d6f7 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-03-20 18:17:18 +01:00
kent@kent-amd64.(none)
a149769b2d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-20 17:58:30 +01:00
kent@kent-amd64.(none)
a947708760 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-20 17:53:25 +01:00
tomas@whalegate.ndb.mysql.com
3f16977b32 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-20 17:08:23 +01:00
tomas@whalegate.ndb.mysql.com
7bd5241cb4 enabled test case 
+ some fixes to do the enable
 2007-03-20 17:07:53 +01:00
jonas@perch.ndb.mysql.com
8c3751209c Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-20 16:36:31 +01:00
jonas@perch.ndb.mysql.com
42b3e0a5af Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-03-20 16:32:11 +01:00
jonas@perch.ndb.mysql.com
9ce7ad943b Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-03-20 16:26:51 +01:00
jonas@perch.ndb.mysql.com
844845c772 ndb - bug#27283 (wl2325-5.0) 
Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH
 2007-03-20 16:16:25 +01:00
jonas@perch.ndb.mysql.com
7898079378 ndb - bug#27291 
Fix correct min-value for LockPagesInMemory
 2007-03-20 16:08:39 +01:00
iggy@recycle.(none)
a56b04476a Merge recycle.(none):/src/bug23736/my50-bug23736 
into  recycle.(none):/src/bug23736/my51-bug23736
 2007-03-20 10:54:56 -04:00
msvensson@pilot.blaudden
dc7a024526 chmod u+x win/build-vs*.bat 2007-03-20 15:42:34 +01:00
iggy@recycle.(none)
cd686bf7e8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  recycle.(none):/src/bug25765/my51-bug25765
 2007-03-20 10:35:10 -04:00
iggy@recycle.(none)
988ce58052 Bug#23736 Pointer free error in mysqlbinlog 
- Mis-matched SAFEMALLOC defines caused misleading error message.
 2007-03-20 10:34:25 -04:00
kaa@polly.local
41992a2729 Merge polly.local:/tmp/maint/bug23775/my50-bug23775 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-03-20 17:27:49 +03:00
iggy@recycle.(none)
ebbd5525ca Post Merge Fix. 2007-03-20 10:22:15 -04:00