Commits · c2a9d3bf70cbb608243e8eb6f0deebcb7a8c6a8d · Kirill Smelkov / mariadb

30 Nov, 2005 1 commit
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · c2a9d3bf
  gluh@mysql.com authored Nov 30, 2005
```
into mysql.com:/home/gluh/MySQL/Merge/5.0
```
  c2a9d3bf
29 Nov, 2005 9 commits
- Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 04d1ef90
  aivanov@mysql.com authored Nov 29, 2005
```
into  mysql.com:/home/alexi/dev/mysql-5.0-build
```
  04d1ef90
- Merge bk-internal:/home/bk/mysql-5.0 · 6246425e
  knielsen@mysql.com authored Nov 29, 2005
```
into  mysql.com:/usr/local/mysql/mysql-5.0
```
  6246425e
- test fixed · 655c9b93
  holyfoot@deer.(none) authored Nov 29, 2005
  
  655c9b93
- Moved long running query to type_newdecimal-big.test · 4fc659bf
  knielsen@mysql.com authored Nov 29, 2005
```
Removed warnings that depends on floating point comparisions in type_newdecimal.test which caused failures in some setups
[Backported from mysql-5.1-new @1.1961.1.1]
```
  4fc659bf
- Merge bk@192.168.21.1:mysql-5.0 · c60b8e30
  holyfoot@mysql.com authored Nov 29, 2005
```
into mysql.com:/home/hf/work/mysql-5.0.14693
```
  c60b8e30
- Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 572e338f
  gluh@mysql.com authored Nov 29, 2005
```
into mysql.com:/home/gluh/MySQL/Merge/4.1
```
  572e338f
- Fix for bug#14221 SSL support breaks going from OpenSSL 0.9.7i to 0.9.8a · 4b6a94ff
  gluh@eagle.intranet.mysql.r18.ru authored Nov 29, 2005
```
  added SSL_library_init()
```
  4b6a94ff
- 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 21 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
- Changed mysqld.dsp to avoid compilation error in VC++ · 6680d33a
  aivanov@mysql.com authored Nov 28, 2005
  
  6680d33a
- 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 8 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