Commits · 5018fa3638c719d4bbe7191fb1729bcd06083807 · nexedi / MariaDB

22 Mar, 2007 3 commits
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 5018fa36
  kent@kent-amd64.(none) authored Mar 22, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  5018fa36
- Makefile.am: · 056356db
  kent@mysql.com/kent-amd64.(none) authored Mar 22, 2007
```
  Don't install benchmark executable
CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO
```
  056356db
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · ccc97686
  kent@kent-amd64.(none) authored Mar 22, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  ccc97686
21 Mar, 2007 10 commits
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · fb336272
  df@pippilotta.erinye.com authored Mar 21, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  fb336272
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · eff3e782
  df@pippilotta.erinye.com authored Mar 21, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  eff3e782
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701 · dc710af8
  df@pippilotta.erinye.com authored Mar 21, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  dc710af8
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701 · 306af196
  df@pippilotta.erinye.com authored Mar 21, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701
```
  306af196
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701 · 069a2189
  df@pippilotta.erinye.com authored Mar 21, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  069a2189
- fix shell script · 677ca6bb
  df@pippilotta.erinye.com authored Mar 21, 2007
  
  677ca6bb
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701 · 90da5ed4
  df@pippilotta.erinye.com authored Mar 21, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  90da5ed4
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701 · 45b80e68
  df@pippilotta.erinye.com authored Mar 21, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  45b80e68
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701 · 4cae191d
  df@pippilotta.erinye.com authored Mar 21, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701
```
  4cae191d
- mysqlbinlog-cp932.test: · 9d4a0118
  holyfoot/abotchkov@mysql.com/bk-internal.mysql.com authored Mar 21, 2007
```
  merging
```
  9d4a0118
20 Mar, 2007 26 commits
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 411333c3
  kent@kent-amd64.(none) authored Mar 21, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  411333c3
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-release · 031fd30d
  kent@mysql.com/kent-amd64.(none) authored Mar 21, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
```
  031fd30d
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · d21bf445
  joerg@trift2. authored Mar 20, 2007
```
into  trift2.:/MySQL/M51/test-help-5.1
```
  d21bf445
- Merge trift2.:/MySQL/M50/test-help-5.0 · 16ec3cb3
  joerg@trift2. authored Mar 20, 2007
```
into  trift2.:/MySQL/M51/test-help-5.1
```
  16ec3cb3
- Merge trift2.:/MySQL/M41/test-help-4.1 · 602ed0a9
  joerg@trift2. authored Mar 20, 2007
```
into  trift2.:/MySQL/M50/test-help-5.0
```
  602ed0a9
- Test "help": · 69a2dcda
  joerg@trift2. authored Mar 20, 2007
```
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.
```
  69a2dcda
- Merge trift2.:/MySQL/M41/test-help-4.1 · 54dd7a51
  joerg@trift2. authored Mar 20, 2007
```
into  trift2.:/MySQL/M50/test-help-5.0
```
  54dd7a51
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0e84886d
  kent@mysql.com/kent-amd64.(none) authored Mar 20, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
```
  0e84886d
- Test "help": · 86483de2
  joerg@trift2. authored Mar 20, 2007
```
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.
```
  86483de2
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 240bbc6d
  kent@kent-amd64.(none) authored Mar 20, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  240bbc6d
- echo.c: · 39e9a2d3
  kent@mysql.com/kent-amd64.(none) authored Mar 20, 2007
```
  Corrected GPL to be version 2 only
```
  39e9a2d3
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · b57f37d6
  joerg@trift2. authored Mar 20, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  b57f37d6
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · a149769b
  kent@kent-amd64.(none) authored Mar 20, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  a149769b
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · a9477087
  kent@kent-amd64.(none) authored Mar 20, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  a9477087
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · aab816e7
  df@pippilotta.erinye.com authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  aab816e7
- vio.vcproj, mysqld.vcproj, mysys.vcproj, libmysqld.vcproj, mysqldemb.vcproj: · cd1005ab
  kent@mysql.com/kent-amd64.(none) authored Mar 20, 2007
```
  No need to set LICENSE or USE_SYMDIR from project files
make_win_bin_dist:
  Changed location of SQL initialization files to be "share/"
```
  cd1005ab
- tests fixed to work in embedded server · 0233b135
  holyfoot/hf@mysql.com/hfmain.(none) authored Mar 20, 2007
  
  0233b135
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 50c90912
  df@pippilotta.erinye.com authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  50c90912
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · f6c30190
  df@pippilotta.erinye.com authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  f6c30190
- small build fix · 56856d6f
  df@pippilotta.erinye.com authored Mar 20, 2007
  
  56856d6f
- build fix for netware · 8161dcaa
  df@pippilotta.erinye.com authored Mar 20, 2007
  
  8161dcaa
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · e4a9917b
  df@pippilotta.erinye.com authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  e4a9917b
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · bc7e1eee
  df@pippilotta.erinye.com authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  bc7e1eee
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 5572ab14
  df@pippilotta.erinye.com authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  5572ab14
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 8e209e93
  joerg@trift2. authored Mar 20, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  8e209e93
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 45fb6c90
  ibabaev@bk-internal.mysql.com authored Mar 20, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
```
  45fb6c90
19 Mar, 2007 1 commit
- sql_insert.cc: · 41c73249
  evgen@moonbone.local authored Mar 20, 2007
```
  After merge fix.
```
  41c73249