Commits · ae53002e6e0cccd8d4b17f24a00c6ec98d63d4c1 · Kirill Smelkov / mariadb

02 Nov, 2007 9 commits

unknown authored Nov 02, 2007

  Removed place holder for 'manual.chm'
.del-manual.chm:
  Delete: Docs/manual.chm


BitKeeper/deleted/.del-manual.chm:
  Delete: Docs/manual.chm
Docs/Makefile.am:
  Removed place holder for 'manual.chm'

ae53002e

Merge mysql.com:/home/kent/bk/bug25205/mysql-4.1-build · 8e51ade9
unknown authored Nov 02, 2007
```
into  mysql.com:/home/kent/bk/bug25205/mysql-5.0-build
```
8e51ade9
Merge mysql.com:/home/kent/bk/bug25205/mysql-4.0 · 49472b07
unknown authored Nov 02, 2007
```
into  mysql.com:/home/kent/bk/bug25205/mysql-4.1-build
```
49472b07

Makefile.am: · d6c83016

unknown authored Nov 02, 2007

  Don't install INSTALL-BINARY, handled by build scripts


Docs/Makefile.am:
  Don't install INSTALL-BINARY, handled by build scripts

d6c83016

Makefile.am: · c8a757db

unknown authored Nov 02, 2007

  Added manual.chm to EXTRA_DIST
  Removed install of INSTALL-BINARY, handled
  by install scripts.
ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE:
  Updated links to version 5.0 of the manual


Docs/INSTALL-BINARY:
  Updated links to version 5.0 of the manual
INSTALL-SOURCE:
  Updated links to version 5.0 of the manual
INSTALL-WIN-SOURCE:
  Updated links to version 5.0 of the manual
support-files/MacOSX/ReadMe.txt:
  Updated links to version 5.0 of the manual
Docs/Makefile.am:
  Added manual.chm to EXTRA_DIST
  Removed install of INSTALL-BINARY, handled
  by install scripts.

c8a757db

Merge mysql.com:/home/kent/bk/bug25205/mysql-4.1-build · 9dc02827

unknown authored Nov 02, 2007

into  mysql.com:/home/kent/bk/bug25205/mysql-5.0-build


BitKeeper/deleted/.del-generate-text-files.pl:
  SCCS merged
Docs/Makefile.am:
  SCCS merged

9dc02827

INSTALL-WIN-SOURCE: · 8f040941

unknown authored Nov 02, 2007

  BitKeeper file /home/kent/bk/bug25205/mysql-4.1-build/INSTALL-WIN-SOURCE


INSTALL-WIN-SOURCE:
  BitKeeper file /home/kent/bk/bug25205/mysql-4.1-build/INSTALL-WIN-SOURCE

8f040941

Merge mysql.com:/home/kent/bk/bug25205/mysql-4.0 · acea5f18
unknown authored Nov 02, 2007
```
into  mysql.com:/home/kent/bk/bug25205/mysql-4.1-build
```
acea5f18

mysql.info, INSTALL-BINARY, INSTALL-SOURCE, ReadMe.txt, Docs/Makefile.am: · 5ee36c1d

unknown authored Nov 02, 2007

  Let place holders for real documentation have text that
  makes sense to the user (Bug#25205)


BitKeeper/deleted/.del-generate-text-files.pl:
  Delete: Docs/Support/generate-text-files.pl
Docs/INSTALL-BINARY:
  BitKeeper file /home/kent/bk/bug25205/mysql-4.0/Docs/INSTALL-BINARY
INSTALL-SOURCE:
  BitKeeper file /home/kent/bk/bug25205/mysql-4.0/INSTALL-SOURCE
support-files/MacOSX/ReadMe.txt:
  BitKeeper file /home/kent/bk/bug25205/mysql-4.0/support-files/MacOSX/ReadMe.txt
Docs/mysql.info:
  More of a end-user text
Docs/Makefile.am:
  Don't generate text files from the documentation

5ee36c1d

30 Oct, 2007 3 commits

Makefile.am: · 1de7e5c0

unknown authored Oct 30, 2007

  Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
  work around for problem with automake 1.10 (bug#24809)


cmd-line-utils/libedit/Makefile.am:
  Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
  work around for problem with automake 1.10 (bug#24809)

1de7e5c0

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · e3b246d6
unknown authored Oct 30, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
e3b246d6
bug#30630 · b0bc908c
unknown authored Oct 30, 2007

b0bc908c

29 Oct, 2007 4 commits

Merge trift2.:/MySQL/M41/push-4.1 · a2f5911b
unknown authored Oct 29, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
a2f5911b

Merge trift2.:/MySQL/M50/clone-5.0 · b63ae73d

unknown authored Oct 29, 2007

into  trift2.:/MySQL/M50/push-5.0


mysql-test/r/derived.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/type_date.result:
  Null-merge 5.0.50 build clone:
  The test for bug#31221 is already in the receiving tree.
mysql-test/t/type_date.test:
  Null-merge 5.0.50 build clone:
  The test for bug#31221 is already in the receiving tree.

b63ae73d

Merge trift2.:/MySQL/M50/mysql-5.0 · 93265192
unknown authored Oct 29, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
93265192
Merge trift2.:/MySQL/M41/mysql-4.1 · afa5d5a6
unknown authored Oct 29, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
afa5d5a6

25 Oct, 2007 2 commits

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build · 392ade80
unknown authored Oct 25, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
392ade80

add new trigger to prevent certain naming clashes · 80241b44

unknown authored Oct 25, 2007


BitKeeper/triggers/pre-commit.check-case.pl:
  catch duplicate file names, ignoring capitalisation, mostly to avoid changesets where a deleted file foobar and a deleted file FooBar break a tree on case insensitive file systems

80241b44

23 Oct, 2007 15 commits

Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · fa0e1d6b
unknown authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
fa0e1d6b

Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 8479eb1d

unknown authored Oct 23, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/type_datetime.result:
  manual merge
mysql-test/r/type_decimal.result:
  manual merge
mysql-test/t/type_datetime.test:
  manual merge
mysql-test/t/type_decimal.test:
  manual merge
sql/item.cc:
  manual merge

8479eb1d

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c448d2ed
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
c448d2ed
Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt · 72bd96ae
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
```
72bd96ae
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f7f8ca8b
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
f7f8ca8b
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 2d4639c4
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
```
2d4639c4
type conversions fixed to get rid of warnings · 4e5c8bc7
unknown authored Oct 23, 2007
```
sql/ha_heap.cc:
  type conversion fix
sql/opt_range.cc:
  type conversion fix
```
4e5c8bc7
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 73d08e3a
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
73d08e3a
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 084753af
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
084753af
type conversion fixed to get rid of warnings · 8262c4f4
unknown authored Oct 23, 2007
```
sql/opt_range.cc:
  type conversion fixed
```
8262c4f4
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · a9a50c72
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
a9a50c72
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8a790dd1
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
8a790dd1

type conversions fixed to avoid warnings on Windows · e1dc86b0

unknown authored Oct 23, 2007


myisam/mi_write.c:
  type conversion fixed
myisam/sort.c:
  type conversion fixed
sql/ha_federated.cc:
  type conversion fixed
sql/ha_heap.cc:
  type conversion fixed
sql/ha_innodb.cc:
  type conversion fixed
sql/ha_myisam.cc:
  type conversion fixed
sql/opt_range.cc:
  type conversion fixed
sql/sql_map.cc:
  type conversion fixed
sql/sql_select.cc:
  type conversion fixed
sql/sql_update.cc:
  type conversion fixed

e1dc86b0

Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 31634a38
unknown authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
```
31634a38

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 933bf869

unknown authored Oct 23, 2007

into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt


sql/field.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

933bf869

22 Oct, 2007 5 commits

Bug #28687: Search fails on '0000-00-00' date after sql_mode change · 849bcf94

unknown authored Oct 22, 2007

When doing indexed search the server constructs a key image for 
faster comparison to the stored keys. While doing that it must not
perform (and stop if they fail) the additional date checks that can 
be turned on by the SQL mode because there already may be values in 
the table that don't comply with the error checks.
Fixed by ignoring these SQL mode bits while making the key image.


mysql-test/r/type_date.result:
  Bug #28687: test case
mysql-test/t/type_date.test:
  Bug #28687: test case
sql/item.cc:
  Bug #28687: no invalid date warnings

849bcf94

Fix for bug #31742: delete from ... order by function call that causes · bbce18c3

unknown authored Oct 22, 2007

an error, asserts server

In case of a fatal error during filesort in find_all_keys() the error
was returned without the necessary handler uninitialization.
Fixed by changing the code so that handler uninitialization is performed
before returning the error.


mysql-test/r/delete.result:
  Added a test case for bug #31742.
mysql-test/t/delete.test:
  Added a test case for bug #31742.
sql/filesort.cc:
  In case of a fatal error in find_all_keys() do not return before doing
  the necessary handler uninitialization steps.

bbce18c3

Merge trift2.:/MySQL/M50/mysql-5.0 · 004691e0
unknown authored Oct 22, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
004691e0
Merge bk@192.168.21.1:mysql-5.0-opt · 578c2386
unknown authored Oct 22, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
578c2386
Merge mysql.com:/home/hf/work/29801/my50-29801 · dda58628
unknown authored Oct 22, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
dda58628

21 Oct, 2007 2 commits
- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · e763badf
  unknown authored Oct 22, 2007
```
into  mysql.com:/scratch/tnurnberg/31588/50-31588
```
  e763badf
- Merge polly.(none):/home/kaa/src/opt/bug28550/my50-bug28550 · fb434504
  unknown authored Oct 21, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
```
  fb434504