Commits · ef3bbc426c42e17bd3527a47173b8c323cf5cda1 · nexedi / MariaDB

23 Mar, 2007 2 commits
- additional changes to merge fix for bug 26346 · ef3bbc42
  Damien@damiendev. authored Mar 22, 2007
  
  ef3bbc42
- Merge damiendev.:C:/build/mysql-5.1/..\dev50 · db6f8d8f
  Damien@damiendev. authored Mar 22, 2007
```
into  damiendev.:C:/build/mysql-5.1
```
  db6f8d8f
22 Mar, 2007 13 commits
- Merge damiendev.:C:/build/mysql-5.0 · 53679c03
  Damien@damiendev. authored Mar 22, 2007
```
into  damiendev.:C:/build/dev50
```
  53679c03
- Merge siva.hindu.god:/home/tsmith/m/bk/maint/50 · de07f782
  tsmith@siva.hindu.god authored Mar 22, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
```
  de07f782
- Bug#26346: stack + buffer overrun in mysqldump · 0fc5ad1e
  Damien@damiendev. authored Mar 22, 2007
```
Fixes to buffer overlows from long command line args, and unchecked dyn_str return codes. Also light refactoring.
```
  0fc5ad1e
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · d645496e
  jonas@perch.ndb.mysql.com authored Mar 22, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  d645496e
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · ca05bbf9
  jonas@perch.ndb.mysql.com authored Mar 22, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  ca05bbf9
- ndb - · 702b5dad
  jonas@perch.ndb.mysql.com authored Mar 22, 2007
```
  fix test prg
```
  702b5dad
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 47834f39
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  47834f39
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 8b964c2b
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  8b964c2b
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 753bc96e
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  753bc96e
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 6e7528bd
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  6e7528bd
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6bab2f13
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  6bab2f13
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · c0d1f9fd
  tsmith@quadxeon.mysql.com authored Mar 22, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  c0d1f9fd
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 54e7bc8d
  tsmith@quadxeon.mysql.com authored Mar 22, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  54e7bc8d
21 Mar, 2007 25 commits
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 4981d459
  tsmith@quadxeon.mysql.com authored Mar 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  4981d459
- Update the result file with an updated comment. · f017117d
  kostja@bodhi.local authored Mar 22, 2007
  
  f017117d
- Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 9279170e
  kostja@bodhi.local authored Mar 22, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  9279170e
- Try to fix events_logs_tests race on Windows. · 54076b30
  kostja@bodhi.local authored Mar 22, 2007
  
  54076b30
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 95597c83
  kostja@bodhi.local authored Mar 21, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  95597c83
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c011a25f
  kostja@bodhi.local authored Mar 21, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
  c011a25f
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · c1e6a4c4
  iggy@recycle.(none) authored Mar 21, 2007
```
into  recycle.(none):/src/bug27144/my50-bug27144
```
  c1e6a4c4
- Merge recycle.(none):/src/bug27144/my50-bug27144 · 762eae0b
  iggy@recycle.(none) authored Mar 21, 2007
```
into  recycle.(none):/src/bug27144/my51-bug27144
```
  762eae0b
- Bug#27144 sp-destruct.test is disabled on Windows · a763917a
  iggy@recycle.(none) authored Mar 21, 2007
```
- Update test to run properly on Windows.
```
  a763917a
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 9800fbf0
  iggy@recycle.(none) authored Mar 21, 2007
```
into  recycle.(none):/src/bug23736/my50-bug23736
```
  9800fbf0
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 0d3aefcd
  iggy@recycle.(none) authored Mar 21, 2007
```
into  recycle.(none):/src/bug23736/my51-bug23736
```
  0d3aefcd
- Fix warnings on Windows. · 102f298a
  kostja@bodhi.local authored Mar 21, 2007
  
  102f298a
- Fix a broken merge. · 39eafdd8
  kostja@bodhi.local authored Mar 21, 2007
  
  39eafdd8
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 48768c6d
  jonas@perch.ndb.mysql.com authored Mar 21, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  48768c6d
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · ca00e638
  jonas@perch.ndb.mysql.com authored Mar 21, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  ca00e638
- Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 2cd7ff4e
  jonas@perch.ndb.mysql.com authored Mar 21, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  2cd7ff4e
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 8a149f26
  jonas@perch.ndb.mysql.com authored Mar 21, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
```
  8a149f26
- ndb - bug#27283 · b950160a
  jonas@perch.ndb.mysql.com authored Mar 21, 2007
```
    Additional fix for 2-node case
```
  b950160a
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · a0c2fae0
  msvensson@pilot.blaudden authored Mar 21, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  a0c2fae0
- Merge bk-internal:/home/bk/mysql-5.0-maint · 31b2f339
  msvensson@pilot.blaudden authored Mar 21, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  31b2f339
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · 7c5df4d3
  msvensson@pilot.blaudden authored Mar 21, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  7c5df4d3
- Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-build · 79216dad
  aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi authored Mar 21, 2007
```
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
```
  79216dad
- Merge... · ac1c81dd
  aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi authored Mar 21, 2007
```
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
```
  ac1c81dd
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · c01f3165
  tomas@whalegate.ndb.mysql.com authored Mar 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  c01f3165
- mysqlbinlog-cp932.test: · 9d4a0118
  holyfoot/abotchkov@mysql.com/bk-internal.mysql.com authored Mar 21, 2007
```
  merging
```
  9d4a0118