Commits · b1b37094d9103c39071f6d414ad75dbcf98f495d · Kirill Smelkov / mariadb

11 Jul, 2005 1 commit
- Apply security patch to bundled zlib for CAN-2005-2096. (Bug #11844) · b1b37094
  unknown authored Jul 11, 2005
```
zlib/inftrees.c:
  Apply security patch for CAN-2005-2096
```
  b1b37094
08 Jul, 2005 4 commits

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca · 1f58b8f9
unknown authored Jul 08, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
```
1f58b8f9

unknown authored Jul 08, 2005

  Corrected libs and lib search path for debug target


VC++Files/tests/mysql_client_test.dsp:
  Corrected libs and lib search path for debug target

6fcb9562

Merge mysql.com:/space/my/mysql-4.1-build · 4d65b85e
unknown authored Jul 08, 2005
```
into mysql.com:/space/my/mysql-4.1
```
4d65b85e

- added mysql-test/t/*.def to the source and binary distributions · 3d2814d6

unknown authored Jul 08, 2005


mysql-test/Makefile.am:
  - added mysql-test/t/*.def to the source distribution and make sure that "make install"
    installs it, too.
scripts/make_binary_distribution.sh:
  - added mysql-test/t/*.def to the binary distribution

3d2814d6

07 Jul, 2005 4 commits

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca · 5b49a4ff
unknown authored Jul 07, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
```
5b49a4ff

mtr_cases.pl: · ce5f68cf

unknown authored Jul 07, 2005

  Added support for the disabled.def file


mysql-test/lib/mtr_cases.pl:
  Added support for the disabled.def file

ce5f68cf

Merge neptunus.(none):/home/msvensson/mysql/bug11635/my41-bug11635 · 826b1db2
unknown authored Jul 07, 2005
```
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
```
826b1db2

BUG#11635 mysqldump exports TYPE instead of USING for HASH Cluster indexes · 46d472d6

unknown authored Jul 07, 2005

  - Change output from SHOW CREATE TABLE to use USING instead of TYPE


mysql-test/r/ctype_utf8.result:
  Update test results
mysql-test/r/show_check.result:
  Update test results
mysql-test/r/sql_mode.result:
  Update test results
mysql-test/t/show_check.test:
  Add test for BUG#11635
sql/sql_show.cc:
  Change TYPE to USING as output from SHOW CREATE TABLE

46d472d6

06 Jul, 2005 18 commits

Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 · b10b9fdc
unknown authored Jul 06, 2005
```
into  zim.(none):/home/brian/mysql/mysql-4.1


BitKeeper/etc/config:
  Auto merged
```
b10b9fdc

Typo for debug code. Bug #11705 · e2aa2abd

unknown authored Jul 06, 2005


vio/viossl.c:
  Typo for dbug code
BitKeeper/etc/config:
  turned off openlogging

e2aa2abd

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca · f8babb1a
unknown authored Jul 06, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
```
f8babb1a

mtr_misc.pl: · 0f063423

unknown authored Jul 06, 2005

  Corrected appending of .exe to Windows executables
  Don't alter read only @_ in foreach loop
mysql-test-run.pl:
  Improved cleanup of binlogs
  Use separate log file for second master
  Corrected Windows paths to executables


mysql-test/mysql-test-run.pl:
  Improved cleanup of binlogs
  Use separate log file for second master
  Corrected Windows paths to executables
mysql-test/lib/mtr_misc.pl:
  Corrected appending of .exe to Windows executables
  Don't alter read only @_ in foreach loop

0f063423

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca · 8e9492f0
unknown authored Jul 06, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
```
8e9492f0

mysql-test-run.pl: · b5081acd

unknown authored Jul 06, 2005

  Handle case where SHELL isn't set in Cygwin
mysql_client_test.dsp:
  Put output into the "client_debug" and "client_release" directories


VC++Files/tests/mysql_client_test.dsp:
  Put output into the "client_debug" and "client_release" directories
mysql-test/mysql-test-run.pl:
  Handle case where SHELL isn't set in Cygwin

b5081acd

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 903e4040
unknown authored Jul 06, 2005
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
```
903e4040
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7f0667c6
unknown authored Jul 06, 2005
```
into mysql.com:/space/my/mysql-4.1
```
7f0667c6
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 21ca7e7c
unknown authored Jul 06, 2005
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
```
21ca7e7c

Merge mysql.com:/space/my/mysql-4.0-build · 81c31e3b

unknown authored Jul 06, 2005

into mysql.com:/space/my/mysql-4.1-build


scripts/make_binary_distribution.sh:
  Auto merged

81c31e3b

- backported a change for make_binary_distribution.sh from 5.0 for easier building of · 2a04d155

unknown authored Jul 06, 2005

  all versions: added an option "--machine" that allows to override the autodetected
  architecture string (e.g. "i386") that becomes part of the binary package name with 
  a different one
- moved the removal of the BASE directory to the end of the make_binary_distribution
  script


scripts/make_binary_distribution.sh:
  - backported and fixed a change from 5.0 for easier building of all versions: added an
    option "--machine" that allows to override the autodetected architecture string 
    (e.g. "i386") that becomes part of the binary package name with a different one
  - moved the removal of the BASE directory to the end of the script

2a04d155

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 13331c74
unknown authored Jul 06, 2005
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
```
13331c74
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · e0df26b1
unknown authored Jul 06, 2005
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
```
e0df26b1
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2aaca01c
unknown authored Jul 06, 2005
```
into mysql.com:/space/my/mysql-4.1
```
2aaca01c
Fixed handling of failed primary key update in INSERT .. ON DUPLICATE KEY UPDATE .. · 6ef62738
unknown authored Jul 06, 2005

6ef62738

a fix (bug #11544: Use of missing rint() function on QNX). · 502aa66c

unknown authored Jul 06, 2005


include/my_global.h:
  a fix (bug #11544: Use of missing rint() function on QNX).
  We have to explicitly specify std:: namespace to use 
  rint() and isnan() functions in C++ scope on QNX due 
  to an error in the /usr/include/math.h

502aa66c

Merge · 81655600

unknown authored Jul 06, 2005


mysql-test/r/func_str.result:
  SCCS merged
mysql-test/t/func_str.test:
  SCCS merged

81655600

Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9d706f8d
unknown authored Jul 06, 2005
```
into mysql.com:/space/my/mysql-4.1
```
9d706f8d

05 Jul, 2005 13 commits

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7dbf0235
unknown authored Jul 06, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
```
7dbf0235

Fix test cases · 8218398c

unknown authored Jul 05, 2005


mysql-test/r/query_cache.result:
  Remove stray empty line
mysql-test/r/grant.result:
  Update results
mysql-test/t/grant.test:
  Fix test case to

8218398c

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 97b4cf0e
unknown authored Jul 06, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
```
97b4cf0e

Makefile.am: · b0a6a8e1

unknown authored Jul 05, 2005

  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir


client/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
cmd-line-utils/libedit/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
dbug/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
extra/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
heap/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
isam/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysql/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysql_r/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysqld/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysqld/examples/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
merge/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
myisam/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
myisammrg/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
mysql-test/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
mysys/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
netware/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
regex/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
sql/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
strings/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
tests/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
vio/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
tools/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir

b0a6a8e1

Merge mysql.com:/home/jimw/my/mysql-4.1-10986 · a27b5b31
unknown authored Jul 05, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
a27b5b31
Merge mysql.com:/home/jimw/my/mysql-4.1-11440 · 128712c0
unknown authored Jul 05, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_table.cc:
  Auto merged
```
128712c0
Merge mysql.com:/home/jimw/my/mysql-4.1-11330 · 83d9aa14
unknown authored Jul 05, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
83d9aa14
Merge mysql.com:/space/my/mysql-4.0-build · a74abb5b
unknown authored Jul 05, 2005
```
into mysql.com:/space/my/mysql-4.1-build


BitKeeper/etc/config:
  Auto merged
```
a74abb5b

lowercase_table2.test, lowercase_table2.result: · d2119109

unknown authored Jul 05, 2005

  Use IF EXISTS in initiation section


mysql-test/r/lowercase_table2.result:
  Use IF EXISTS in initiation section
mysql-test/t/lowercase_table2.test:
  Use IF EXISTS in initiation section

d2119109

- disabled openlogging to satisfy BK when using a commercial license key · 74c0d194
unknown authored Jul 05, 2005

74c0d194
Merge mysql.com:/home/bkroot/mysql-4.1 · 5842bccf
unknown authored Jul 05, 2005
```
into mysql.com:/home/bk/b11401-mysql-4.1
```
5842bccf

Bug#11401: Setting thd->lex so that engines (i.e., InnoDB) recognizes · 28f554af

unknown authored Jul 05, 2005

this as a LOAD DATA ... REPLACE INTO .. statement.


sql/log_event.cc:
  Setting thd->lex so that engines (i.e., InnoDB) recognizes this 
  as a LOAD DATA ... REPLACE INTO .. statement.

28f554af

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · cd427705
unknown authored Jul 05, 2005
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
```
cd427705