Commits · bbe58c7e263658ac67032782a9268c43aabc997c · Kirill Smelkov / mariadb

01 Nov, 2005 9 commits
- Manually merged · bbe58c7e
  evgen@moonbone.local authored Nov 01, 2005
  
  bbe58c7e
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 47059b89
  evgen@moonbone.local authored Nov 01, 2005
```
into moonbone.local:/work/14186-bug-4.1-mysql
```
  47059b89
- Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort · e5f48e13
  monty@mysql.com authored Nov 01, 2005
```
Fix for bug #14536: SELECT @A,@A:=... fails with prepared statements
```
  e5f48e13
- Additional fix for bug #14445 (analyse.test fails) · f3502cd9
  hf@deer.(none) authored Nov 01, 2005
  
  f3502cd9
- Review of new pushed code · 19502e8e
  monty@mysql.com authored Nov 01, 2005
```
Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
Mark that add_time(), time_diff() and str_to_date() can return null values
```
  19502e8e
- Fix for bug #14445 (analyse.test fails) · b98c93e0
  hf@deer.(none) authored Nov 01, 2005
  
  b98c93e0
- gis.test fixed · 69cd4c1e
  hf@deer.(none) authored Nov 01, 2005
  
  69cd4c1e
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · fdcb437b
  ramil@mysql.com authored Nov 01, 2005
```
into  mysql.com:/usr/home/ram/work/mysql-4.1
```
  fdcb437b
- mysql-test-run.pl: · 2c6902a0
  kent@mysql.com authored Nov 01, 2005
```
  Make IM ports change with MTR_BUILD_THREAD
```
  2c6902a0
31 Oct, 2005 11 commits
- Fixed bugs in client/mysqltest.c which made lots of "connect" commands in tests fail. · 1137a376
  pem@mysql.com authored Oct 31, 2005
  
  1137a376
- Accept any shared library for "libz", not just the static one. Bug#6584 · 4c73ac66
  joerg@mysql.com authored Oct 31, 2005
  
  4c73ac66
- Removed C++-isms from client/mysqltest.c · 81437a72
  pem@mysql.com authored Oct 31, 2005
  
  81437a72
- Check for NULLs only if we don't replace column results, · afbd0faf
  ramil@mysql.com authored Oct 31, 2005
```
get real results after all checks.
(see bug #14254: func_crypt.test fails on FreeBSD with --ps-protocol).
```
  afbd0faf
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · da64397b
  jani@ua141d10.elisa.omakaista.fi authored Oct 31, 2005
```
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
```
  da64397b
- Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 · 44aea416
  jani@ua141d10.elisa.omakaista.fi authored Oct 31, 2005
```
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
```
  44aea416
- Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 · 5150bd8f
  hf@deer.(none) authored Oct 31, 2005
```
into deer.(none):/home/hf/work/mysql-4.1.12839
```
  5150bd8f
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 531b847f
  msvensson@neptunus.(none) authored Oct 31, 2005
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
  531b847f
- Additional fix for #12839 · 16c66d49
  hf@deer.(none) authored Oct 31, 2005
  
  16c66d49
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3612707c
  sergefp@mysql.com authored Oct 31, 2005
```
into mysql.com:/home/psergey/mysql-5.0-oct25-test
```
  3612707c
- BUG#14139 - Merge to 5.0 · 4ad3313c
  sergefp@mysql.com authored Oct 31, 2005
  
  4ad3313c
29 Oct, 2005 5 commits
- Minor comments. · fd3a3c22
  konstantin@mysql.com authored Oct 29, 2005
  
  fd3a3c22
- Merge bk-internal:/home/bk/mysql-4.1 · b919b29d
  jimw@mysql.com authored Oct 28, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
  b919b29d
- Merge mysql.com:/home/jimw/my/mysql-4.1-13811 · 27685c0c
  jimw@mysql.com authored Oct 28, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
  27685c0c
- Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 22fe31e4
  patg@krsna.patg.net authored Oct 28, 2005
```
into  krsna.patg.net:/home/patg/mysql-build/mysql-4.1
```
  22fe31e4
- Merge mysql.com:/home/jimw/my/mysql-4.1-13796 · 0e572ff4
  jimw@mysql.com authored Oct 28, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
  0e572ff4
28 Oct, 2005 15 commits
- 4.1->5.0 merge · 09a4d0c7
  sergefp@mysql.com authored Oct 29, 2005
  
  09a4d0c7
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3e76aa38
  sergefp@mysql.com authored Oct 29, 2005
```
into mysql.com:/home/psergey/mysql-5.0-oct25-test
```
  3e76aa38
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 351ac284
  evgen@moonbone.local authored Oct 29, 2005
```
into moonbone.local:/work/14138-bug-5.0-mysql
```
  351ac284
- sql_select.cc: · b5d5e9a5
  evgen@moonbone.local authored Oct 29, 2005
```
  After merge fix
```
  b5d5e9a5
- Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 · 19544bd0
  paul@frost.snake.net authored Oct 28, 2005
```
into  frost.snake.net:/Users/paul/bk/mysql-5.0
```
  19544bd0
- Manually merged · ddea0b44
  evgen@moonbone.local authored Oct 28, 2005
  
  ddea0b44
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7be79121
  sergefp@mysql.com authored Oct 28, 2005
```
into mysql.com:/home/psergey/mysql-5.0-oct25-test
```
  7be79121
- Merge · eb57f520
  sergefp@mysql.com authored Oct 28, 2005
  
  eb57f520
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · f220d874
  sergefp@mysql.com authored Oct 28, 2005
```
into mysql.com:/home/psergey/mysql-4.1-bug14139
```
  f220d874
- Merge bk-internal:/home/bk/mysql-5.0 · f6995841
  jimw@mysql.com authored Oct 28, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
  f6995841
- Update test with changed result after merge · 552c208b
  jimw@mysql.com authored Oct 28, 2005
  
  552c208b
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 06c17bac
  msvensson@neptunus.(none) authored Oct 28, 2005
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
  06c17bac
- Update after merge, include libtaoint-integer.o into libtaocrypt.a · 3c696721
  msvensson@neptunus.(none) authored Oct 28, 2005
  
  3c696721
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2e127c92
  jani@a193-229-222-105.elisa-laajakaista.fi authored Oct 28, 2005
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
```
  2e127c92
- Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0156fd94
  aivanov@mysql.com authored Oct 28, 2005
```
into  mysql.com:/home/alexi/dev/mysql-4.1-10511
```
  0156fd94