Commits · fb650b8aad05be3790e4954e1de200ec5fa2855e · Kirill Smelkov / mariadb

07 Nov, 2006 4 commits
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · fb650b8a
  petr/cps@outpost.site authored Nov 08, 2006
```
into  outpost.site:/home/cps/mysql/trees/mysql-5.1-runtime
```
  fb650b8a
- Automerge fix. · 6b0e7f3e
  anozdrin/alik@alik. authored Nov 07, 2006
  
  6b0e7f3e
- Merge alik.:/mnt/raid/alik/MySQL/devel/5.1 · ee15c11b
  anozdrin/alik@alik. authored Nov 07, 2006
```
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
```
  ee15c11b
- Fix Bug #22494 Instance Manager: Inconsistent error message wording · 1b44fe61
  petr/cps@outpost.site authored Nov 07, 2006
```
Use better wording
```
  1b44fe61
06 Nov, 2006 1 commit
- Fix a typo in SETUP.sh · 103e0d5e
  kostja@bodhi.local authored Nov 06, 2006
  
  103e0d5e
05 Nov, 2006 5 commits
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · b28b07f0
  petr/cps@outpost.site authored Nov 06, 2006
```
into  outpost.site:/home/cps/mysql/trees/5.1-runtime-bug9191
```
  b28b07f0
- fix mysql-test-run.pl to support --timezone option, · 0372ca79
  petr/cps@outpost.site authored Nov 06, 2006
```
which got broken during refactoring.
```
  0372ca79
- Merge outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191 · 1b231a17
  petr/cps@outpost.site authored Nov 06, 2006
```
into  outpost.site:/home/cps/mysql/trees/5.1-runtime-bug9191
```
  1b231a17
- Merge outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191 · 660c2f0c
  petr/cps@outpost.site authored Nov 05, 2006
```
into  outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191
```
  660c2f0c
- Add missing DBUG_RETURN() · 51ff0db0
  petr/cps@outpost.site authored Nov 05, 2006
  
  51ff0db0
04 Nov, 2006 6 commits
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · a56565b8
  msvensson@neptunus.(none) authored Nov 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  a56565b8
- Remove old comments · 56f10ac8
  msvensson@neptunus.(none) authored Nov 04, 2006
  
  56f10ac8
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · abd1e54d
  msvensson@neptunus.(none) authored Nov 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  abd1e54d
- Disable user_limits for bug23921 · 83a44bd8
  msvensson@neptunus.(none) authored Nov 04, 2006
  
  83a44bd8
- Updates for abi_check · 39a346b7
  msvensson@neptunus.(none) authored Nov 04, 2006
  
  39a346b7
- Merge neptunus.(none):/home/msvensson/mysql/my50-m-stress · d59a3b4d
  msvensson@neptunus.(none) authored Nov 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  d59a3b4d
03 Nov, 2006 20 commits
- Bug#21114 (Foreign key creation fails to table with name format) · ff4a58bc
  malff/marcsql@weblab.(none) authored Nov 03, 2006
```
Fixed the tests for case insensitive platforms
```
  ff4a58bc
- Fiexes for --stress mode in mysql-test-run.pl · aa19771c
  msvensson@neptunus.(none) authored Nov 03, 2006
  
  aa19771c
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 899dca14
  msvensson@neptunus.(none) authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  899dca14
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 63091e07
  msvensson@neptunus.(none) authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  63091e07
- Fix problem with mysql.test relying on "echo" behaviour · 78af4ae4
  msvensson@neptunus.(none) authored Nov 03, 2006
  
  78af4ae4
- Fix DBUG_PRINT in mysqltest, the real value to print is in ds_cmd · fa79d0fc
  msvensson@neptunus.(none) authored Nov 03, 2006
  
  fa79d0fc
- Don't warn about "Found non pid file" for elements that are not files. · 570f6039
  msvensson@neptunus.(none) authored Nov 03, 2006
  
  570f6039
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · b850ae8a
  msvensson@neptunus.(none) authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  b850ae8a
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 5c086315
  msvensson@neptunus.(none) authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/my50-m-stress
```
  5c086315
- Use lowercase for "Too long dbname" test as it will be put ot lower on some... · 795ad91b
  msvensson@neptunus.(none) authored Nov 03, 2006
```
Use lowercase for "Too long dbname" test as it will be put ot lower on some platforms and we don't wan't to test that.
```
  795ad91b
- Remove sql_state-h from list of include files. (Merge error from 4.1) · 74496f8d
  msvensson@neptunus.(none) authored Nov 03, 2006
  
  74496f8d
- Merge neptunus.(none):/home/msvensson/mysql/my41-m-stress · 1c19dc7e
  msvensson@neptunus.(none) authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/my50-m-stress
```
  1c19dc7e
- Fix mysql-test-run.pl for "bin dist" look in "bin" directory for client binaries as well. · 7b4a8e41
  msvensson@neptunus.(none) authored Nov 03, 2006
  
  7b4a8e41
- Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-monty · 18fb4abf
  anozdrin/alik@alik. authored Nov 03, 2006
```
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
```
  18fb4abf
- Merge bk-internal:/home/bk/mysql-5.0-maint · 580b540d
  msvensson@neptunus.(none) authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  580b540d
- Fix typo, Add "s" to format specifier for --stress-init-file · d94101f7
  msvensson@neptunus.(none) authored Nov 03, 2006
  
  d94101f7
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 69676574
  kroki/tomash@moonlight.intranet authored Nov 03, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-cleanup
```
  69676574
- Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup · d5a69e6f
  kroki/tomash@moonlight.intranet authored Nov 03, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-cleanup
```
  d5a69e6f
- Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-cleanup · 1dbf98d1
  kroki/tomash@moonlight.intranet authored Nov 03, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup
```
  1dbf98d1
- Cleanup: fix race in rename.test. · fbf508d6
  kroki/tomash@moonlight.intranet authored Nov 03, 2006
  
  fbf508d6
02 Nov, 2006 4 commits
- Fix merge collision. · e235c8c4
  cmiller@zippy.cornsilk.net authored Nov 02, 2006
  
  e235c8c4
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · b074e134
  cmiller@zippy.cornsilk.net authored Nov 02, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  b074e134
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · af5acac0
  cmiller@zippy.cornsilk.net authored Nov 02, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  af5acac0
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c34f3219
  cmiller@zippy.cornsilk.net authored Nov 02, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
```
  c34f3219