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 |
|
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 |
|
kent@mysql.com
|
4cea53dd7d
|
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
|
2005-07-02 01:49:22 +02:00 |
|
bell@sanja.is.com.ua
|
17ef6b7d77
|
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug5-4.1
|
2005-07-01 20:14:55 +03:00 |
|
bell@sanja.is.com.ua
|
b6dc32a755
|
fixed create_distinct_group() to make references via ref_pointer_array
|
2005-07-01 20:13:07 +03:00 |
|
lars@mysql.com
|
02d0fdf470
|
Merge mysql.com:/home/bkroot/mysql-4.1
into mysql.com:/home/bk/b11678-mysql-4.1
|
2005-07-01 16:13:05 +02:00 |
|
msvensson@neptunus.(none)
|
11d3c28575
|
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
|
2005-07-01 15:40:29 +02:00 |
|
msvensson@neptunus.(none)
|
9613c434e0
|
Win port fixes
|
2005-07-01 15:39:36 +02:00 |
|
lars@mysql.com
|
4120003926
|
BUG#11678: mysqldump --master-data should fail if master binlog disabled
|
2005-07-01 12:01:00 +02:00 |
|
monty@mysql.com
|
3d02b808ba
|
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
|
2005-07-01 10:07:01 +03:00 |
|
monty@mysql.com
|
e3a4c1a6b2
|
Optimization during review
Add extra check to delete [] to ensure we are not deleting not allocated data
|
2005-07-01 09:40:05 +03:00 |
|
lenz@mysql.com
|
59b5c9bf66
|
- backport of a compile fix from 4.1 (ChangeSet@1.2260.23.2 2005/05/19 from reggie)
"changed dl_name to udf->dl in mysql_create_function"
|
2005-06-30 17:33:23 +02:00 |
|
jani@ua141d10.elisa.omakaista.fi
|
15d4217c58
|
Don't allow 8bytes for data file pointers for now.
|
2005-06-30 17:55:47 +03:00 |
|
jani@ua141d10.elisa.omakaista.fi
|
b60175f9c4
|
Fixed Bug#11226 and reverted fix for Bug#6993.
Using 8 bytes for data pointer does not work at least on
all computers. The result may become 0 or negative number.
(mysqld, myisamchk)
|
2005-06-30 16:13:22 +03:00 |
|
mskold@mysql.com
|
569a846120
|
Changed delete_row to always get key from record argument, removed unused function
|
2005-06-29 16:17:47 +02:00 |
|
mskold@mysql.com
|
ec4bb86379
|
Changed delete_row to always get key from record argument
|
2005-06-29 16:13:50 +02:00 |
|
mskold@mysql.com
|
ff764e2b5a
|
Moved connections first in test, to reduce risk of connecting before servers are fully connected
|
2005-06-29 15:31:43 +02:00 |
|
igor@rurik.mysql.com
|
ce53a3f229
|
Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
|
2005-06-29 02:44:41 -07:00 |
|
igor@rurik.mysql.com
|
4b8f2e9bb4
|
func_str.test:
Added test cases for bug #11469.
item_strfunc.h:
Fixed bug #11469: wrong implementation of the not_null_tables
method for CONCAT_WS.
|
2005-06-29 02:40:25 -07:00 |
|