Commits · cf53cd27b001fe3cb04ed48c9a66ef452edff38f · Kirill Smelkov / mariadb

22 Jan, 2007 5 commits
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · cf53cd27
  df@kahlann.erinye.com authored Jan 22, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
```
  cf53cd27
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work-24780 · 5fe6fc1d
  df@kahlann.erinye.com authored Jan 22, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
  5fe6fc1d
- after-merge fix · c1243725
  df@kahlann.erinye.com authored Jan 22, 2007
  
  c1243725
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work1-testcases-20061 · 58bf0722
  df@kahlann.erinye.com authored Jan 22, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
  58bf0722
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build · 930a1fe1
  df@kahlann.erinye.com authored Jan 22, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
```
  930a1fe1
18 Jan, 2007 8 commits
- ndb_types.test: sleep a bit longer, to ensure that timestamp > @now · f5aab8b2
  tsmith@siva.hindu.god authored Jan 18, 2007
  
  f5aab8b2
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40 · 58174654
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
```
  58174654
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 · 6fd02a43
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
```
  6fd02a43
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · eec44018
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40
```
  eec44018
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · 2dc96063
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
```
  2dc96063
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4b384061
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
```
  4b384061
- Raise version number after cloning 4.0.29 · c3ab6de2
  joerg/mysqldev@mysql.com/production.mysql.com authored Jan 18, 2007
  
  c3ab6de2
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build · f37e3541
  df@kahlann.erinye.com authored Jan 18, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
```
  f37e3541
17 Jan, 2007 10 commits
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · d6d7385a
  tsmith@siva.hindu.god authored Jan 17, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
```
  d6d7385a
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · 018acedb
  tsmith@siva.hindu.god authored Jan 17, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
```
  018acedb
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · fa927d7e
  tsmith@siva.hindu.god authored Jan 17, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
```
  fa927d7e
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721 · c9a0cccc
  cmiller@zippy.cornsilk.net authored Jan 17, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
```
  c9a0cccc
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · bbaf3275
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Jan 17, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
```
  bbaf3275
- Bug#23721: compile fails: check-cpu mishandles cpu flags with \ · 332f9ff8
  cmiller@zippy.cornsilk.net authored Jan 17, 2007
```
	hyphen in it (like ds-cpl).

convert illegal chars in cpu flags to '_' for variable assignment
```
  332f9ff8
- Fix a failure of lowercase_tables2 test on powermacg5, introduced · 6399db74
  kostja@bodhi.local authored Jan 17, 2007
```
by the patch for Bug#4968
```
  6399db74
- Bug#25505 Myisam library compiler error on Windows · 29be5ce8
  msvensson@pilot.mysql.com authored Jan 17, 2007
  
  29be5ce8
- Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1 · 8154355a
  msvensson@pilot.mysql.com authored Jan 17, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
```
  8154355a
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build · 06e3471a
  df@kahlann.erinye.com authored Jan 17, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
```
  06e3471a
16 Jan, 2007 1 commit
- A fix for the broken 4.1-runtime tree. · 51a2f515
  kostja@bodhi.local authored Jan 16, 2007
  
  51a2f515
15 Jan, 2007 3 commits
- A post-merge fix. · d49ac4fb
  kostja@bodhi.local authored Jan 15, 2007
  
  d49ac4fb
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime · d53072d1
  kostja@bodhi.local authored Jan 15, 2007
```
into  bodhi.local:/opt/local/work/mysql-4.1-4968-to-push
```
  d53072d1
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build · b818104d
  df@kahlann.erinye.com authored Jan 15, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
```
  b818104d
12 Jan, 2007 5 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · a7862496
  kostja@bodhi.local authored Jan 12, 2007
```
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
```
  a7862496
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4ffada35
  joerg@trift2. authored Jan 12, 2007
```
into  trift2.:/MySQL/M41/mysql-4.1
```
  4ffada35
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · 22398faa
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Jan 12, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
```
  22398faa
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build · 363bc66a
  df@kahlann.erinye.com authored Jan 12, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
```
  363bc66a
- Merge trift2.:/MySQL/M41/mysql-4.1 · 59e2133e
  joerg@trift2. authored Jan 12, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  59e2133e
11 Jan, 2007 8 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · dd03d51f
  kostja@bodhi.local authored Jan 11, 2007
```
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
```
  dd03d51f
- Merge mysqldev@production.mysql.com:my/mysql-4.0-15815 · f3025c11
  joerg@trift2. authored Jan 11, 2007
```
into  trift2.:/MySQL/M40/mysql-4.0
```
  f3025c11
- Merge mysqldev@quadxeon:/benchmarks/ext3/TOSAVE/tsmith/bk/g40 · eb18787c
  mysqldev@mysql.com/production.mysql.com authored Jan 11, 2007
```
into  mysql.com:/data0/mysqldev/my/mysql-4.0-15815
```
  eb18787c
- Merge trift2.:/MySQL/M40/clone-4.0 · 671028a4
  joerg@trift2. authored Jan 11, 2007
```
into  trift2.:/MySQL/M40/mysql-4.0
```
  671028a4
- Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint · 75d91ded
  thek@kpdesk.mysql.com authored Jan 11, 2007
```
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
```
  75d91ded
- Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010 · 55558582
  thek@kpdesk.mysql.com authored Jan 11, 2007
```
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint
```
  55558582
- Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint · 1802d5aa
  thek@kpdesk.mysql.com authored Jan 11, 2007
```
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
```
  1802d5aa
- Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint · 0982a1d9
  thek@kpdesk.mysql.com authored Jan 11, 2007
```
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
```
  0982a1d9