Commits · ac72a7ed48d7ea540d96ec87fb9481ab887d8c9c · nexedi / MariaDB

10 Apr, 2006 16 commits
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new · ac72a7ed
  lars@mysql.com authored Apr 10, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
```
  ac72a7ed
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 52f81631
  holyfoot@mysql.com authored Apr 11, 2006
```
into mysql.com:/home/hf/work/mysql-5.1.upgrd
```
  52f81631
- Merge mysql.com:/home/alexi/bugs/mysql-5.0-temp · b43493bb
  aivanov@mysql.com authored Apr 10, 2006
```
into  mysql.com:/home/alexi/bugs/mysql-5.1-temp
```
  b43493bb
- Merge mysql.com:/home/alexi/bugs/mysql-5.0-15868 · 31727db0
  aivanov@mysql.com authored Apr 10, 2006
```
into  mysql.com:/home/alexi/bugs/mysql-5.0-15868-work
```
  31727db0
- Fixed test case result (after BUG#15868 fix). · 6ad6cda2
  aivanov@mysql.com authored Apr 10, 2006
  
  6ad6cda2
- Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · aeeb1992
  aivanov@mysql.com authored Apr 10, 2006
```
into  mysql.com:/home/alexi/bugs/mysql-5.0-15868
```
  aeeb1992
- WL#2645 (mysql_upgrade tool) · b5afca05
  holyfoot@deer.(none) authored Apr 10, 2006
  
  b5afca05
- Updated disable.def file with BUG numbers, time of disable and disabler · 33c3e641
  lars@mysql.com authored Apr 10, 2006
  
  33c3e641
- Merging · a5d18bc8
  holyfoot@mysql.com authored Apr 10, 2006
  
  a5d18bc8
- Merge mysql.com:/home/alexi/bugs/mysql-5.0-15868-work · d70035ca
  aivanov@mysql.com authored Apr 10, 2006
```
into  mysql.com:/home/alexi/bugs/mysql-5.1-15868
 Null-merge
```
  d70035ca
- Fixed BUG#15868: InnoDB hangs under 200 threads making INSERTs: 'thread thrashing'. · bb94bb30
  aivanov@mysql.com authored Apr 10, 2006
```
 Applied changes due Heikki Tuuri.
```
  bb94bb30
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · e4e61b09
  jonas@perch.ndb.mysql.com authored Apr 10, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
  e4e61b09
- Merge perch.ndb.mysql.com:/home/jonas/src/50-jonas · 7e0733fe
  jonas@perch.ndb.mysql.com authored Apr 10, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
  7e0733fe
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 5b387117
  jonas@perch.ndb.mysql.com authored Apr 10, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
  5b387117
- Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ba5d08f3
  brian@zim.(none) authored Apr 09, 2006
```
into  zim.(none):/home/brian/mysql/dep-5.1
```
  ba5d08f3
- Disabling test, added bug #18928 · c33ace09
  brian@zim.(none) authored Apr 09, 2006
  
  c33ace09
09 Apr, 2006 15 commits
- Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0316e7a0
  aelkin@mysql.com authored Apr 09, 2006
```
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
```
  0316e7a0
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · da330a41
  jonas@perch.ndb.mysql.com authored Apr 09, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  da330a41
- Disabled two broken test, created P1 showstoppers from them. · 1d02038c
  brian@zim.(none) authored Apr 09, 2006
  
  1d02038c
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6dbb1eda
  joerg@mysql.com authored Apr 09, 2006
```
into mysql.com:/M51/mysql-5.1
```
  6dbb1eda
- Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 · 5b6708e3
  aelkin@mysql.com authored Apr 09, 2006
```
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
```
  5b6708e3
- Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 95d1d4b5
  aelkin@mysql.com authored Apr 09, 2006
```
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
```
  95d1d4b5
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d2443da4
  jonas@perch.ndb.mysql.com authored Apr 09, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  d2443da4
- Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2d5dd118
  aivanov@mysql.com authored Apr 09, 2006
```
into  mysql.com:/home/alexi/bugs/mysql-5.1-15758
```
  2d5dd118
- Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f5c52797
  aelkin@dl145k.mysql.com authored Apr 09, 2006
```
into  dl145k.mysql.com:/tmp/andrei/5.0.21-bug17284-temp_table
```
  f5c52797
- Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 61c7e4ba
  aivanov@mysql.com authored Apr 09, 2006
```
into  mysql.com:/home/alexi/bugs/mysql-5.0-15758
```
  61c7e4ba
- Merge mysql.com:/home/alexi/bugs/mysql-5.0-15758-work · 1488caec
  aivanov@mysql.com authored Apr 09, 2006
```
into  mysql.com:/home/alexi/bugs/mysql-5.1-15758
```
  1488caec
- BUG#18906 Test case rpl_temporary fails when using --vardir option · cbee6eca
  aelkin@mysql.com authored Apr 09, 2006
```
env variable name is fixed.
```
  cbee6eca
- Merge mysql.com:/users/lthalmann/bk/mysql-5.0-release-bug18116 · ab71e2ac
  lars@mysql.com authored Apr 09, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.0
```
  ab71e2ac
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 69d09a4a
  jonas@perch.ndb.mysql.com authored Apr 09, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  69d09a4a
- Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb · 263276c5
  jonas@perch.ndb.mysql.com authored Apr 09, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  263276c5
08 Apr, 2006 9 commits
- Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 · 9cc16ddb
  aelkin@mysql.com authored Apr 08, 2006
```
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
```
  9cc16ddb
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 50e5752e
  jonas@perch.ndb.mysql.com authored Apr 08, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  50e5752e
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 965d6ac6
  jonas@perch.ndb.mysql.com authored Apr 08, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
  965d6ac6
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 208ae694
  joerg@mysql.com authored Apr 08, 2006
```
into mysql.com:/M51/mysql-5.1
```
  208ae694
- #18906: bushbuild reports rpl_temporary fails on solaris, AIX, QNX · 010a8a57
  aelkin@mysql.com authored Apr 08, 2006
```
Removing the problematic line from include test file.
```
  010a8a57
- Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 · bac42636
  aelkin@mysql.com authored Apr 08, 2006
```
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
```
  bac42636
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 64c8342f
  jonas@perch.ndb.mysql.com authored Apr 08, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  64c8342f
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e5de83a6
  jonas@perch.ndb.mysql.com authored Apr 08, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  e5de83a6
- Merge mysql.com:/home/mydev/mysql-5.1 · 26c4e82f
  ingo@mysql.com authored Apr 08, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-aid
```
  26c4e82f