kent@mysql.com
be0f916512
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-07-07 18:50:29 +02:00
kent@mysql.com
922f2faa36
mtr_cases.pl:
...
Added support for the disabled.def file
2005-07-07 18:41:22 +02:00
msvensson@neptunus.(none)
a8efd33aec
Merge neptunus.(none):/home/msvensson/mysql/bug11635/my41-bug11635
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-07-07 18:21:20 +02:00
msvensson@neptunus.(none)
50133499b5
BUG#11635 mysqldump exports TYPE instead of USING for HASH Cluster indexes
...
- Change output from SHOW CREATE TABLE to use USING instead of TYPE
2005-07-07 14:44:28 +02:00
brian@zim.(none)
61db785682
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-07-06 15:55:49 -07:00
brian@zim.(none)
8c9dd56b0e
Typo for debug code. Bug #11705
2005-07-06 15:54:02 -07:00
kent@mysql.com
287971069b
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-07-06 22:23:07 +02:00
kent@mysql.com
fe21793446
mtr_misc.pl:
...
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
2005-07-06 22:21:35 +02:00
kent@mysql.com
128ec8876b
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-07-06 16:21:14 +02:00
kent@mysql.com
8b2ee5b11e
mysql-test-run.pl:
...
Handle case where SHELL isn't set in Cygwin
mysql_client_test.dsp:
Put output into the "client_debug" and "client_release" directories
2005-07-06 16:17:32 +02:00
bell@sanja.is.com.ua
b5690d2149
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
2005-07-06 16:32:25 +03:00
lenz@mysql.com
ba8bb1604a
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-07-06 14:53:54 +02:00
bell@sanja.is.com.ua
94ec658d6f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
2005-07-06 15:20:51 +03:00
lenz@mysql.com
68e5693096
Merge mysql.com:/space/my/mysql-4.0-build
...
into mysql.com:/space/my/mysql-4.1-build
2005-07-06 14:00:24 +02:00
lenz@mysql.com
49986c7e05
- backported a change for make_binary_distribution.sh 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 make_binary_distribution
script
2005-07-06 13:58:29 +02:00
bell@sanja.is.com.ua
f4c1e5fa45
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
2005-07-06 13:23:21 +03:00
mskold@mysql.com
58703a4380
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-07-06 11:50:05 +02:00
lenz@mysql.com
29653d5a79
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-07-06 11:29:22 +02:00
mskold@mysql.com
7063d85bf9
Fixed handling of failed primary key update in INSERT .. ON DUPLICATE KEY UPDATE ..
2005-07-06 11:23:36 +02:00
ramil@mysql.com
f82420356f
a fix (bug #11544 : Use of missing rint() function on QNX).
2005-07-06 13:51:53 +05:00
bell@sanja.is.com.ua
c41c8accd7
Merge
2005-07-06 11:36:27 +03:00
lenz@mysql.com
875a7d596b
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-07-06 08:42:45 +02:00
kent@mysql.com
b6d3eec4f8
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-07-06 00:19:26 +02:00
jimw@mysql.com
ac8f9d3864
Fix test cases
2005-07-05 15:19:04 -07:00
kent@mysql.com
ca420edc21
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-07-06 00:15:55 +02:00
kent@mysql.com
a7be42163a
Makefile.am:
...
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
jimw@mysql.com
c45f86a265
Merge mysql.com:/home/jimw/my/mysql-4.1-10986
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-05 12:56:47 -07:00
jimw@mysql.com
9f654b806a
Merge mysql.com:/home/jimw/my/mysql-4.1-11440
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-05 12:54:12 -07:00
jimw@mysql.com
81e50844b3
Merge mysql.com:/home/jimw/my/mysql-4.1-11330
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-05 12:51:16 -07:00
lenz@mysql.com
ddca379b87
Merge mysql.com:/space/my/mysql-4.0-build
...
into mysql.com:/space/my/mysql-4.1-build
2005-07-05 19:53:35 +02:00
kent@mysql.com
37dd997d8b
lowercase_table2.test, lowercase_table2.result:
...
Use IF EXISTS in initiation section
2005-07-05 17:27:37 +02:00
lenz@mysql.com
eaac485b17
- disabled openlogging to satisfy BK when using a commercial license key
2005-07-05 17:09:56 +02:00
mats@mysql.com
3c42734174
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/b11401-mysql-4.1
2005-07-05 14:08:22 +02:00
mats@mysql.com
6d924c8286
Bug#11401: Setting thd->lex so that engines (i.e., InnoDB) recognizes
...
this as a LOAD DATA ... REPLACE INTO .. statement.
2005-07-05 13:55:54 +02:00
mskold@mysql.com
d36f7357e7
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-07-05 12:24:03 +02:00
lenz@mysql.com
c505134699
- removed Docs/README.1st (it's obsolete)
2005-07-05 09:15:37 +02:00
lenz@mysql.com
57be8f42bf
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-build
2005-07-04 22:20:11 +02:00
lenz@mysql.com
a300489d0c
- The Max package should Require a matching MySQL-server package. Automatically replace
...
the version string with the base version of the current build
2005-07-04 22:11:38 +02:00
mskold@mysql.com
77c481329c
Fixed indentation
2005-07-04 20:36:38 +02:00
lenz@mysql.com
eb88c898de
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-merge
2005-07-04 17:45:56 +02:00
lenz@mysql.com
8ef5ad5364
- manual merge
2005-07-04 16:05:20 +02:00
lenz@mysql.com
e21c783422
Merge mysql.com:/space/my/mysql-4.0.25-clone
...
into mysql.com:/space/my/mysql-4.0-build
2005-07-04 12:59:20 +02:00
lenz@mysql.com
c760d27cf1
- bumped up version number in configure.in to 4.0.26
2005-07-04 12:58:53 +02:00
lars@mysql.com
ff88e6fbf2
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/b11678-mysql-4.1
2005-07-04 11:09:15 +02:00
bell@sanja.is.com.ua
67c9df1eb8
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug_qc-4.1
2005-07-04 01:36:55 +03:00
bell@sanja.is.com.ua
54662b4487
merge
2005-07-04 01:36:06 +03:00
monty@mysql.com
62173c5a9d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-07-02 20:18:43 +03:00
monty@mysql.com
2735d7dcf6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-07-02 16:13:35 +03:00
kent@mysql.com
a06c4692f5
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-07-02 02:07:26 +02:00
kent@mysql.com
22fd02d157
configure.in:
...
Enable build with CXX=gcc and gcc version 4
2005-07-02 02:00:56 +02:00