Commits · 0cf61d620fd462221fd7eb8d9793b5fc7c8767b3 · nexedi / MariaDB

10 Feb, 2006 10 commits
- Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0cf61d62
  jmiller@mysql.com authored Feb 10, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
  0cf61d62
- test updates · 7ce37121
  jmiller@mysql.com authored Feb 10, 2006
  
  7ce37121
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 332a1a1f
  msvensson@neptunus.(none) authored Feb 10, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  332a1a1f
- Merge mysql.com:/usr/local/mysql/mysql-5.1-sp-destruct · 344c3341
  knielsen@mysql.com authored Feb 10, 2006
```
into  mysql.com:/usr/local/mysql/mysql-5.1-new
```
  344c3341
- Fix missing test cleanup · 1bc91adc
  knielsen@mysql.com authored Feb 10, 2006
  
  1bc91adc
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5690dd8b
  msvensson@neptunus.(none) authored Feb 10, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  5690dd8b
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c5794763
  petr@mysql.com authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
```
  c5794763
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f3d73e8c
  petr@mysql.com authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-im-fixes
```
  f3d73e8c
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 392f93c0
  petr@mysql.com authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
```
  392f93c0
- IM changes by GUI team: add a version_no column to the · 84884985
  petr@mysql.com authored Feb 10, 2006
```
SHOW INSTANCE STATUS output
```
  84884985
09 Feb, 2006 26 commits
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5bb07f7e
  tomas@poseidon.ndb.mysql.com authored Feb 10, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  5bb07f7e
- changed to use temporary heap table on a ndb test · 76f6331a
  tomas@poseidon.ndb.mysql.com authored Feb 10, 2006
```
corrected multiple --log-bin options in mysql-test-run
```
  76f6331a
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · fe0ff3e2
  tomas@poseidon.ndb.mysql.com authored Feb 09, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  fe0ff3e2
- remove volatile. fixes windows build · 0aced4da
  andrey@lmy004. authored Feb 09, 2006
```
WL#1034 (Internal CRON)
```
  0aced4da
- from fix for bug#16414 (Events: Crash or hang if event drops itself) · 541e6734
  andrey@lmy004. authored Feb 09, 2006
```
WL #1034 
```
  541e6734
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 246d0ea2
  tomas@poseidon.ndb.mysql.com authored Feb 09, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  246d0ea2
- Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 24c01089
  andrey@lmy004. authored Feb 09, 2006
```
into lmy004.:/work/mysql-5.1-events_i_s
```
  24c01089
- Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f8f8af97
  aivanov@mysql.com authored Feb 10, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1-merged
```
  f8f8af97
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 930641a5
  tomas@poseidon.ndb.mysql.com authored Feb 09, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  930641a5
- Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 67985360
  andrey@lmy004. authored Feb 09, 2006
```
into lmy004.:/work/mysql-5.1-events_i_s
```
  67985360
- Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 34b3d548
  andrey@lmy004. authored Feb 09, 2006
```
into lmy004.:/work/mysql-5.1-bug16984
```
  34b3d548
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 3c0ed6d4
  tomas@poseidon.ndb.mysql.com authored Feb 09, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  3c0ed6d4
- Fixed BUG#9680: Wrong error from cascading update · e22d2f11
  aivanov@mysql.com authored Feb 09, 2006
```
  Applied 9680.patch (by Osku Salerma)
```
  e22d2f11
- test updates · a66d8a5b
  jmiller@mysql.com authored Feb 09, 2006
  
  a66d8a5b
- Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster · d1a7592a
  msvensson@neptunus.(none) authored Feb 09, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  d1a7592a
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2a267fed
  konstantin@mysql.com authored Feb 09, 2006
```
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
```
  2a267fed
- Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 3c426cd7
  jmiller@mysql.com authored Feb 09, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
  3c426cd7
- Merge mysql.com:/home/kostja/mysql/mysql-5.0-root · e1f807af
  konstantin@mysql.com authored Feb 09, 2006
```
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
```
  e1f807af
- Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster · 63f9b6ce
  msvensson@neptunus.(none) authored Feb 09, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster
```
  63f9b6ce
- Force stop of old cluster · 35fc3dcc
  msvensson@neptunus.(none) authored Feb 09, 2006
  
  35fc3dcc
- Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster · c2df73e2
  msvensson@neptunus.(none) authored Feb 09, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster
```
  c2df73e2
- Start cluster only for testcases that really needs it and stop it when · 0e9e1f2c
  msvensson@neptunus.(none) authored Feb 09, 2006
```
not needed by the tescases. This will save test time for those testcases
that does not need cluster, but need a restart, as they dont have to wait
the extra time it would take for cluster to restart. It will also save
time for other testcases, as cluster does not 
need to be contacted for each table to be dropped or created.
Backport from 5.1
```
  0e9e1f2c
- Merge mysql.com:/usr/local/mysql/mysql-5.1-winfix · 2b5a4e28
  knielsen@mysql.com authored Feb 09, 2006
```
into  mysql.com:/usr/local/mysql/mysql-5.1-new
```
  2b5a4e28
- added cmake file for instance manager · a7666569
  reggie@big_geek. authored Feb 08, 2006
  
  a7666569
- Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 01a8c544
  brian@zim.tangent.org authored Feb 08, 2006
```
into  zim.tangent.org:/home/brian/mysql/cleanup-5.1
```
  01a8c544
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d39cb0eb
  tomas@poseidon.ndb.mysql.com authored Feb 09, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  d39cb0eb
08 Feb, 2006 4 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 51fda104
  konstantin@mysql.com authored Feb 09, 2006
```
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
```
  51fda104
- rpl_ndb_sync.result, rpl_ndb_sync.test: · 74d8c2b8
  jmiller@mysql.com authored Feb 08, 2006
```
  Fixed bug in test for when NDB is set to default engine - Thanks Tomas, you were right
```
  74d8c2b8
- rpl_stm_log.result: · 057b3f9e
  jmiller@mysql.com authored Feb 08, 2006
```
  Fixed bug in test case
```
  057b3f9e
- Merge mysql.com:/home/kostja/mysql/tmp_merge1 · 19018128
  konstantin@mysql.com authored Feb 09, 2006
```
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
```
  19018128