Commits · 1b26de73d59c913535682128db46b48253d1d596 · nexedi / MariaDB

02 May, 2007 16 commits
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 1b26de73
  df@pippilotta.erinye.com authored May 02, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  1b26de73
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 39e98943
  df@pippilotta.erinye.com authored May 02, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  39e98943
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 5d97bc65
  df@pippilotta.erinye.com authored May 02, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  5d97bc65
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-cmake-map-files · 765b6f55
  df@pippilotta.erinye.com authored May 02, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  765b6f55
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-cmake-map-files · 45df7b36
  df@pippilotta.erinye.com authored May 02, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  45df7b36
- Merge trift2.:/MySQL/M51/spec-5.1 · 2df354dc
  joerg@trift2. authored May 02, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  2df354dc
- Merge trift2.:/MySQL/M51/mysql-5.1 · 489da225
  joerg@trift2. authored May 02, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  489da225
- Merge trift2.:/MySQL/M50/mysql-5.0 · 0db7e9c4
  joerg@trift2. authored May 02, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  0db7e9c4
- "ndb_size.tmpl" is gone (NDB change 2007-04-24), so remove it from the spec file. · 11484e33
  joerg@trift2. authored May 02, 2007
  
  11484e33
- Merge trift2.:/MySQL/M50/spec-5.0 · 8a08eec8
  joerg@trift2. authored May 02, 2007
```
into  trift2.:/MySQL/M51/spec-5.1
```
  8a08eec8
- Merge trift2.:/MySQL/M41/spec-4.1 · fc8b2783
  joerg@trift2. authored May 02, 2007
```
into  trift2.:/MySQL/M50/spec-5.0
```
  fc8b2783
- RPM spec file error: Trailing '*' to cover '.gz' for a man page was missing. · f32c2619
  joerg@trift2. authored May 02, 2007
  
  f32c2619
- generate map files on windows · 971992ea
  df@pippilotta.erinye.com authored May 02, 2007
  
  971992ea
- Manual merge: Makefile lines must start with tab, not blank. · 6ee2fa0f
  joerg@trift2. authored May 02, 2007
  
  6ee2fa0f
- Merge trift2.:/MySQL/M50/mysql-5.0 · f486530d
  joerg@trift2. authored May 02, 2007
```
into  trift2.:/MySQL/M51/mysql-5.1
```
  f486530d
- Format corrections for various "Makefile.am": Leading tab, no trailing blank. · bb2996f4
  joerg@trift2. authored May 02, 2007
  
  bb2996f4
01 May, 2007 11 commits
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · b4b44b0b
  tsmith@quadxeon.mysql.com authored May 01, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  b4b44b0b
- mysql-test-run.pl: · fc7fea0c
  tsmith@quadxeon.mysql.com authored May 01, 2007
```
  Run master init scripts also for --embedded-server
```
  fc7fea0c
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 · b0007916
  tsmith@quadxeon.mysql.com authored May 01, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  b0007916
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · 90468a72
  tsmith@quadxeon.mysql.com authored May 01, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  90468a72
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 2a4a7ffd
  tomas@whalegate.ndb.mysql.com authored May 01, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  2a4a7ffd
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 · 1462967a
  tsmith@quadxeon.mysql.com authored May 01, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  1462967a
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · 91a58307
  tsmith@quadxeon.mysql.com authored May 01, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  91a58307
- Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 53cdf37a
  holyfoot/hf@hfmain.(none) authored May 01, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  53cdf37a
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 13cfd947
  tsmith@quadxeon.mysql.com authored May 01, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  13cfd947
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 9aad848a
  tsmith@quadxeon.mysql.com authored May 01, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  9aad848a
- Fix braindead bad merge of mysqldump test. · 6dbfd215
  tsmith@quadxeon.mysql.com authored May 01, 2007
  
  6dbfd215
30 Apr, 2007 13 commits
- Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 73fe16cb
  dkatz@damien-katzs-computer.local authored Apr 30, 2007
```
into  damien-katzs-computer.local:/Users/dkatz/mysql50
```
  73fe16cb
- Merge damien-katzs-computer.local:/Users/dkatz/mysql50 · 33f8677d
  dkatz@damien-katzs-computer.local authored Apr 30, 2007
```
into  damien-katzs-computer.local:/Users/dkatz/mysql51
```
  33f8677d
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50 · e267f900
  tsmith@quadxeon.mysql.com authored Apr 30, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  e267f900
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · f440e299
  tsmith@quadxeon.mysql.com authored Apr 30, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  f440e299
- Bug #27653: Temp table can't be created if lower_case_table_names=1 and · 44af4144
  tsmith@quadxeon.mysql.com authored Apr 30, 2007
```
            tmpdir has uppercase

Fix: don't convert mysql_tmpdir to lower case when building the path to a
temporary table
```
  44af4144
- Merge damien-katzs-computer.local:/Users/dkatz/mysql50 · b578abc0
  dkatz@damien-katzs-computer.local authored Apr 30, 2007
```
into  damien-katzs-computer.local:/Users/dkatz/50_frm_files
```
  b578abc0
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 5ab7eb6a
  joerg@trift2. authored Apr 30, 2007
```
into  trift2.:/MySQL/M51/netware-cross-5.1
```
  5ab7eb6a
- Merge trift2.:/MySQL/M50/netware-cross-5.0 · 331902b7
  joerg@trift2. authored Apr 30, 2007
```
into  trift2.:/MySQL/M51/netware-cross-5.1
```
  331902b7
- Necessary change for cross-builds: Include "mysql_fix_privilege_tables_sql.c"... · 8b0f6833
  joerg@trift2. authored Apr 30, 2007
```
Necessary change for cross-builds:  Include "mysql_fix_privilege_tables_sql.c" in the source tarball.
```
  8b0f6833
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 1e06586c
  tomas@whalegate.ndb.mysql.com authored Apr 30, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  1e06586c
- shorten filenames · dd58f5a4
  tomas@whalegate.ndb.mysql.com authored Apr 30, 2007
  
  dd58f5a4
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 15cfd0fd
  jonas@perch.ndb.mysql.com authored Apr 30, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  15cfd0fd
- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 4f321a09
  tnurnberg@maint1.mysql.com authored Apr 30, 2007
```
into  maint1.mysql.com:/data/localhome/tnurnberg/51-27293
```
  4f321a09