Commits · 0f73558ee3d8ca74af60b0a4d1de788ac84721ea · Kirill Smelkov / mariadb

29 Nov, 2005 2 commits
- Merge mysql.com:/usr/home/bar/mysql-4.1.b10446 · 0f73558e
  bar@mysql.com authored Nov 29, 2005
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
  0f73558e
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5c1ba75c
  bar@mysql.com authored Nov 29, 2005
```
into  mysql.com:/usr/home/bar/mysql-4.1.b10446
```
  5c1ba75c
28 Nov, 2005 20 commits
- Merge bk-internal:/home/bk/mysql-5.0 · 1a391f71
  jimw@mysql.com authored Nov 28, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
  1a391f71
- Merge bk-internal:/home/bk/mysql-5.0 · fc1ee24f
  knielsen@mysql.com authored Nov 28, 2005
```
into  mysql.com:/usr/local/mysql/mysql-5.0
```
  fc1ee24f
- Merge mysql.com:/home/jimw/my/mysql-4.1-5792 · 5f7e5b46
  jimw@mysql.com authored Nov 28, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
  5f7e5b46
- Merge mysql.com:/home/jimw/my/mysql-5.0-14956 · 9df4951a
  jimw@mysql.com authored Nov 28, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
  9df4951a
- Merge mysql.com:/home/jimw/my/mysql-4.1-14155 · 99297e44
  jimw@mysql.com authored Nov 28, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
  99297e44
- Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 · ba8d1f13
  msvensson@devsrv-b.mysql.com authored Nov 28, 2005
```
into  devsrv-b.mysql.com:/space/magnus/mysql-5.0
```
  ba8d1f13
- Merge mysqldev@production:my/mysql-4.1.16-fixes · f0c5aae5
  knielsen@mysql.com authored Nov 28, 2005
```
into  mysql.com:/usr/local/mysql/mysql-4.1
```
  f0c5aae5
- Merge mysqldev@production:my/mysql-4.1.16-fixes · ce63d425
  knielsen@mysql.com authored Nov 28, 2005
```
into  mysql.com:/usr/local/mysql/mysql-5.0
```
  ce63d425
- Include libyassl.la and libtaocrypt.la in libmysqlclient.la · 9a84dcc1
  msvensson@neptunus.(none) authored Nov 28, 2005
  
  9a84dcc1
- Merge mysql.com:/usr/local/mysql/mysql-4.1 · eb34dafb
  knielsen@mysql.com authored Nov 28, 2005
```
into  mysql.com:/usr/local/mysql/mysql-5.0
```
  eb34dafb
- Merge mysql.com:/usr/local/bk/mysql-5.0 · 341f9412
  pem@mysql.com authored Nov 28, 2005
```
into  mysql.com:/usr/home/pem/bug14643/mysql-5.0
```
  341f9412
- Minor Win32 compile fixes for 4.1.16 release. · 9248dfc8
  knielsen@mysql.com authored Nov 28, 2005
  
  9248dfc8
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2b18be14
  bar@mysql.com authored Nov 28, 2005
```
into  mysql.com:/usr/home/bar/mysql-4.1.b14406
```
  2b18be14
- grant.result: · 814f6c6c
  bar@mysql.com authored Nov 28, 2005
```
  After merge fix.
```
  814f6c6c
- Merge mysql.com:/usr/local/bk/mysql-5.0 · df553710
  pem@mysql.com authored Nov 28, 2005
```
into  mysql.com:/usr/home/pem/bug14643/mysql-5.0
```
  df553710
- Merge mysql.com:/usr/home/bar/mysql-4.1.b14406 · 8f33adc1
  bar@mysql.com authored Nov 28, 2005
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
  8f33adc1
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1263105c
  bar@mysql.com authored Nov 28, 2005
```
into  mysql.com:/usr/home/bar/mysql-5.0.param
```
  1263105c
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 63b038f2
  bar@mysql.com authored Nov 28, 2005
```
into  mysql.com:/usr/home/bar/mysql-4.1.b14406
```
  63b038f2
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 114cf112
  kent@mysql.com authored Nov 28, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
```
  114cf112
- item.cc, item.h: · 4ac260ae
  bar@mysql.com authored Nov 28, 2005
```
  Fixing Item_param::safe_charset_converter to do less "new"s.
```
  4ac260ae
27 Nov, 2005 1 commit
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8d6811de
  serg@serg.mylan authored Nov 27, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
```
  8d6811de
26 Nov, 2005 10 commits
- Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5c93bf90
  igor@rurik.mysql.com authored Nov 26, 2005
```
into  rurik.mysql.com:/home/igor/mysql-5.0
```
  5c93bf90
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 1cf71d05
  serg@serg.mylan authored Nov 26, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
```
  1cf71d05
- Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · c246aa16
  serg@serg.mylan authored Nov 26, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  c246aa16
- Merge rurik.mysql.com:/home/igor/mysql-5.0 · a87477d1
  igor@rurik.mysql.com authored Nov 26, 2005
```
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
```
  a87477d1
- Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 · 6a83b757
  serg@serg.mylan authored Nov 26, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
```
  6a83b757
- followup for for the bug#5686 · 701de9be
  serg@serg.mylan authored Nov 26, 2005
  
  701de9be
- Enabled back bunch of tests for stored routines which were disabled · ca8c984e
  dlenev@mysql.com authored Nov 26, 2005
```
earlier because of various features/checks missing (these features/checks
are now implemented).
```
  ca8c984e
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 122b597f
  serg@serg.mylan authored Nov 26, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
```
  122b597f
- documenting HA_STATUS_xxx flags · 10df921c
  serg@serg.mylan authored Nov 26, 2005
  
  10df921c
- Fixed bug #15106. · 881e6e68
  igor@rurik.mysql.com authored Nov 25, 2005
```
A typo bug caused loss of a predicate of the form field=const in some cases.
```
  881e6e68
25 Nov, 2005 7 commits
- Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0745c8f2
  msvensson@devsrv-b.mysql.com authored Nov 25, 2005
```
into  devsrv-b.mysql.com:/space/magnus/mysql-5.0
```
  0745c8f2
- Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 · cbd1ea07
  msvensson@devsrv-b.mysql.com authored Nov 25, 2005
```
into  devsrv-b.mysql.com:/space/magnus/mysql-5.0
```
  cbd1ea07
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · e5592190
  sergefp@mysql.com authored Nov 25, 2005
```
into mysql.com:/home/psergey/mysql-5.0-bug15204
```
  e5592190
- BUG#15024: get_best_covering_ror_intersect() tries to build ROR-intersection · 526a1d89
  sergefp@mysql.com authored Nov 25, 2005
```
by starting with an empty index set and adding indexes to it until it
becomes covering. If the set becomes covering after adding the first index,
return NULL and don't try constructing ROR-intersection of one index (which
caused a crash)
```
  526a1d89
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c779c2c8
  konstantin@mysql.com authored Nov 25, 2005
```
into  mysql.com:/opt/local/work/mysql-5.0-root
```
  c779c2c8
- Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15168/my50-bug15168 · 3879027a
  msvensson@devsrv-b.mysql.com authored Nov 25, 2005
```
into  devsrv-b.mysql.com:/space/magnus/mysql-5.0
```
  3879027a
- Post-merge fixes. · 463175c4
  konstantin@mysql.com authored Nov 25, 2005
  
  463175c4