Commits · dcdd8612f49d58a8c48b0100e9d1defe0aebaddf · Kirill Smelkov / mariadb

24 Jul, 2006 3 commits
- After merge fix · dcdd8612
  ingo/mydev@chilla.local authored Jul 24, 2006
  
  dcdd8612
- After merge fix · cf708395
  ingo/mydev@chilla.local authored Jul 24, 2006
  
  cf708395
- Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8bb80696
  ingo/mydev@chilla.local authored Jul 24, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-amerge
```
  8bb80696
23 Jul, 2006 2 commits
- BUG#20294 Instance manager test im_instance_conf fails randomly · dbaba24c
  stewart@willster.(none) authored Jul 24, 2006
```
(well, im_options in this case, but using existing bug report)
```
  dbaba24c
- Merge willster.(none):/home/stewart/Documents/MySQL/5.0/main · 14963037
  stewart@willster.(none) authored Jul 24, 2006
```
into  willster.(none):/home/stewart/Documents/MySQL/5.1/main
```
  14963037
22 Jul, 2006 4 commits
- BUG#20340: NODEGROUP wrong field type in partitions information schema table · 922058ae
  mikael/pappa@dator5.(none) authored Jul 22, 2006
```
Fixes for change that makes default appear in NODEGROUP as it should be instead of 0 which is an error
```
  922058ae
- BUG#20340: NODEGROUP wrong field type in information schema · bdf9ace4
  mikael/pappa@dator5.(none) authored Jul 22, 2006
```
Test case fix
```
  bdf9ace4
- Merge dator5.(none):/home/pappa/bug20340 · ab461c89
  mikael/pappa@dator5.(none) authored Jul 22, 2006
```
into  dator5.(none):/home/pappa/bug20733
```
  ab461c89
- Merge dator5.(none):/home/pappa/clean-mysql-5.1 · 26b50311
  mikael/pappa@dator5.(none) authored Jul 22, 2006
```
into  dator5.(none):/home/pappa/bug20733
```
  26b50311
21 Jul, 2006 1 commit
- After merge fixes. · 84f3623b
  ingo/mydev@chilla.local authored Jul 21, 2006
  
  84f3623b
20 Jul, 2006 3 commits
- Merge chilla.local:/home/mydev/mysql-5.0-mmerge · 18a76a95
  ingo/mydev@chilla.local authored Jul 20, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-amain
```
  18a76a95
- Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-mrg · acb73b1e
  pekka@orca.ndb.mysql.com authored Jul 20, 2006
```
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-mrg
```
  acb73b1e
- BUG20733: Bug in partition pruning with zerofill field · cef00484
  mikael/pappa@dator5.(none) authored Jul 20, 2006
```
Problem was with handling NULL values in ranges
```
  cef00484
18 Jul, 2006 5 commits
- Merge lmy004.:/work/mysql-5.1-runtime · 02e14e63
  andrey@lmy004. authored Jul 18, 2006
```
into  lmy004.:/work/mysql-5.1-clean
```
  02e14e63
- Fix windows build of libmysqld. Curious why pushbuild did not · a68400dd
  andrey@lmy004. authored Jul 18, 2006
```
catch that.
Stale CMakeLists.txt
```
  a68400dd
- after merge fix · 7c0930c4
  gluh@mysql.com/vva.(none) authored Jul 18, 2006
  
  7c0930c4
- Merge myoffice.izhnet.ru:/usr/home/gluh/MySQL/tmp_merge · f76aec6d
  gluh@myoffice.izhnet.ru authored Jul 18, 2006
```
into  myoffice.izhnet.ru:/usr/home/gluh/MySQL/5.1
```
  f76aec6d
- BUG#20340: NODEGROUP in information_schema.partitions integer => · 4b71f42d
  mikael/pappa@dator5.(none) authored Jul 18, 2006
```
error in error log when "default is put into it
NODEGROUP string to cater for "default" in it
```
  4b71f42d
17 Jul, 2006 2 commits
- Fixed test case · bae61f20
  mikael/pappa@dator5.(none) authored Jul 17, 2006
  
  bae61f20
- Fixes for strange appearance of db.opt file · 6019ac9b
  mikael/pappa@dator5.(none) authored Jul 17, 2006
  
  6019ac9b
15 Jul, 2006 13 commits
- Minor fix · 3d442310
  mikael/pappa@dator5.(none) authored Jul 15, 2006
  
  3d442310
- Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 1df07ba2
  mikael/pappa@dator5.(none) authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28
```
  1df07ba2
- Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461 · 6da1b59c
  pekka@orca.ndb.mysql.com authored Jul 15, 2006
```
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51
```
  6da1b59c
- Remove files that tests leave behind · 1c1a1316
  mikael/pappa@dator5.(none) authored Jul 15, 2006
  
  1c1a1316
- Merge dator5.(none):/home/pappa/clean-mysql-5.1 · 27b06d9d
  mikael/pappa@dator5.(none) authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28
```
  27b06d9d
- ndb - ndb_restore: print some dd errors at right verbosity · 54571ec6
  pekka@orca.ndb.mysql.com authored Jul 15, 2006
  
  54571ec6
- Fixes to make tests work in conjunction with other tests · cc545cc6
  mikael/pappa@dator5.(none) authored Jul 15, 2006
  
  cc545cc6
- Merge dator5.(none):/home/pappa/clean-mysql-5.1 · 30989a77
  mikael/pappa@dator5.(none) authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28
```
  30989a77
- Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt · cacbb674
  mikael/pappa@dator5.(none) authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28
```
  cacbb674
- Merge dator5.(none):/home/pappa/bug20852 · a6f310d0
  mikael/pappa@dator5.(none) authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28
```
  a6f310d0
- Merge dator5.(none):/home/pappa/bug20770 · 425c8883
  mikael/pappa@dator5.(none) authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28
```
  425c8883
- Merge dator5.(none):/home/pappa/bug20767 · 5a2edb50
  mikael/pappa@dator5.(none) authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28
```
  5a2edb50
- BUG#20389: Crash when using index scan in reverse order · cfc65ef7
  mikael/pappa@dator5.(none) authored Jul 15, 2006
  
  cfc65ef7
14 Jul, 2006 3 commits
- Fix information_schema.result after a manual merge. · 231565c2
  kostja@bodhi.local authored Jul 15, 2006
  
  231565c2
- Merge bodhi.local:/opt/local/work/tmp_merge · f536f361
  kostja@bodhi.local authored Jul 15, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
```
  f536f361
- Merge mysql.com:/home/psergey/tmp_merge-2 · 2834bc1e
  sergefp@pylon.mylan authored Jul 14, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge-2
```
  2834bc1e
13 Jul, 2006 4 commits
- Post-merge fixes. · 436e7a2d
  kostja@bodhi.local authored Jul 14, 2006
  
  436e7a2d
- Merge bodhi.local:/opt/local/work/tmp_merge · d7845b74
  kostja@bodhi.local authored Jul 13, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
```
  d7845b74
- Merge trift2.:/M50/tmp_merge2 · f6303a8c
  joerg@trift2. authored Jul 13, 2006
```
into  trift2.:/M51/merge-5.1
```
  f6303a8c
- Merge trift2.:/M50/tmp_merge1 · 341f4637
  joerg@trift2. authored Jul 13, 2006
```
into  trift2.:/M51/merge-5.1
```
  341f4637