Commits · 42239919ea102ec5a5e3b5470fa6f65c84620e50 · nexedi / MariaDB

03 May, 2006 31 commits
- Merge bk@192.168.21.1:mysql-5.1-new · 42239919
  holyfoot@mysql.com authored May 04, 2006
```
into mysql.com:/home/hf/work/mysql-5.1.mrg
```
  42239919
- fix include path in windows build · 9d4a065f
  acurtis@xiphis.org authored May 03, 2006
  
  9d4a065f
- fix legacy configure option handling · 16d8d6bc
  acurtis@xiphis.org authored May 03, 2006
  
  16d8d6bc
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7bbd8fb0
  cmiller@zippy.(none) authored May 03, 2006
```
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
```
  7bbd8fb0
- Merge acurtis@bk-internal:/home/bk/mysql-5.1-new · 3954c722
  acurtis@xiphis.org authored May 03, 2006
```
into  xiphis.org:/home/antony/work2/wl3201-final
```
  3954c722
- Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2038e05b
  aivanov@mysql.com authored May 04, 2006
```
into  mysql.com:/home/alexi/dev/mysql-5.1-wl3148
```
  2038e05b
- Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5b20ee67
  aivanov@mysql.com authored May 04, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1
```
  5b20ee67
- Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work · ac0ac6a3
  aivanov@mysql.com authored May 04, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1
```
  ac0ac6a3
- Applied innodb-5.0-ss521 snapshot. · 4cff042a
  aivanov@mysql.com authored May 04, 2006
```
 Fixed BUG#19366: "consistent_snapshot.test fails".
```
  4cff042a
- Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work · 2f190c2c
  aivanov@mysql.com authored May 03, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1
 Null-merge.
```
  2f190c2c
- Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss26-work · a7122276
  aivanov@mysql.com authored May 03, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work
 Null-merge.
```
  a7122276
- Applied innodb-4.1-ss26 snapshot. · d546f0d9
  aivanov@mysql.com authored May 03, 2006
```
 Fixed BUG#19366: "consistent_snapshot.test fails".
```
  d546f0d9
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · b07bb712
  cmiller@zippy.(none) authored May 03, 2006
```
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
```
  b07bb712
- Merge mysql.com:/home/hf/work/mysql-5.0.mrg · 995aae17
  holyfoot@mysql.com authored May 03, 2006
```
into mysql.com:/home/hf/work/mysql-5.1.mrg
```
  995aae17
- merging fix · 5b5db01a
  holyfoot@deer.(none) authored May 03, 2006
  
  5b5db01a
- Added code to remove closing comment code from event text, as would be · a5789854
  cmiller@zippy.(none) authored May 03, 2006
```
supplied inside a  /*!VERSION event-text */  segment.  (Fixes Bug#18078
```
  a5789854
- Fixed dependency checking · 375d3e82
  serg@sergbook.mysql.com authored May 03, 2006
  
  375d3e82
- Merge mysql.com:/home/hf/work/mysql-5.0.mrg · d2174098
  holyfoot@mysql.com authored May 03, 2006
```
into mysql.com:/home/hf/work/mysql-5.1.mrg
```
  d2174098
- merging fix · 81e625ac
  holyfoot@deer.(none) authored May 03, 2006
  
  81e625ac
- Merge mysql.com:/home/hf/work/mysql-5.1.18518 · f63727c9
  holyfoot@mysql.com authored May 03, 2006
```
into mysql.com:/home/hf/work/mysql-5.1.mrg
```
  f63727c9
- merging · 19801820
  holyfoot@mysql.com authored May 03, 2006
  
  19801820
- Merge mysql.com:/home/hf/work/mysql-5.0.18455 · f66bcd25
  holyfoot@mysql.com authored May 03, 2006
```
into mysql.com:/home/hf/work/mysql-5.0.mrg
```
  f66bcd25
- merging · 86cab853
  holyfoot@mysql.com authored May 03, 2006
  
  86cab853
- merging · 7ee205f6
  holyfoot@mysql.com authored May 03, 2006
  
  7ee205f6
- merging · 9de68b81
  holyfoot@mysql.com authored May 03, 2006
  
  9de68b81
- Merge hf@192.168.21.28:work/mysql-4.1.16892 · 86673445
  holyfoot@mysql.com authored May 03, 2006
```
into mysql.com:/home/hf/work/mysql-4.1.mrg
```
  86673445
- Merge mysql.com:/home/hf/work/mysql-4.1.15442 · 486693e2
  holyfoot@mysql.com authored May 03, 2006
```
into mysql.com:/home/hf/work/mysql-4.1.mrg
```
  486693e2
- Merge mysql.com:/home/hf/work/mysql-4.1.15225 · 0007484c
  holyfoot@mysql.com authored May 03, 2006
```
into mysql.com:/home/hf/work/mysql-4.1.mrg
```
  0007484c
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c51d7419
  bar@mysql.com authored May 03, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18170
```
  c51d7419
- Windows build fixes for CMake · 4ba1a4b3
  knielsen@mysql.com authored May 03, 2006
  
  4ba1a4b3
- Merge mysql.com:/usr/home/bar/mysql-5.1-new · 467052aa
  bar@mysql.com authored May 03, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18170
```
  467052aa
02 May, 2006 9 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 96489209
  cmiller@zippy.(none) authored May 02, 2006
```
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
```
  96489209
- pekka:get - push push push · 2b253498
  pekka@mysql.com authored May 02, 2006
  
  2b253498
- Merge mysql.com:/home/dlenev/mysql-5.0-bg11081 · 5cae5405
  dlenev@mysql.com authored May 02, 2006
```
into  mysql.com:/home/dlenev/mysql-5.1-merges
```
  5cae5405
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · ba0752e1
  cmiller@zippy.(none) authored May 02, 2006
```
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
```
  ba0752e1
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · d71f1983
  cmiller@zippy.(none) authored May 02, 2006
```
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
```
  d71f1983
- WL#3148: Modifying sizes of i_s.processlist columns ('time', 'info'). · f6073b27
  aivanov@mysql.com authored May 02, 2006
  
  f6073b27
- More merging assistence. · 5de7b78b
  cmiller@zippy.(none) authored May 02, 2006
```
Logging behavior changed in early 5.1.  (The filename was never right, but
the "opt" file is unnecessary in 5.0 anyway.)
```
  5de7b78b
- WL#3201 post-review fixups · 20b687ce
  acurtis@xiphis.org authored May 02, 2006
  
  20b687ce
- Manually merged · 230b52a8
  cmiller@zippy.(none) authored May 02, 2006
  
  230b52a8