jimw@mysql.com
060a53ab25
Update test results
2005-07-05 18:23:55 -07:00
jimw@mysql.com
af5f5ab3ed
Merge mysql.com:/home/jimw/my/mysql-5.0-6903
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 17:05:31 -07:00
jimw@mysql.com
a2244a9094
Merge jwinstead@production.mysql.com:my/mysql-5.0-10844
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 15:24:35 -07:00
jimw@mysql.com
2669b86612
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 15:23:13 -07: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
8e3b393d5c
Merge
2005-07-06 00:06:11 +02:00
lars@mysql.com
fc0ef06fb7
Merge mysql.com:/home/bkroot/mysql-5.0
...
into mysql.com:/home/bk/mysql-5.0
2005-07-05 23:33:57 +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
kent@mysql.com
81cf9394bf
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-07-05 23:21:30 +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
lars@mysql.com
266bb33e4c
Merge mysql.com:/home/bkroot/mysql-5.0
...
into mysql.com:/home/bk/mysql-5.0
2005-07-05 21:50:34 +02:00
kent@mysql.com
f29a853ad7
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp2
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-07-05 20:49:04 +02: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
jimw@mysql.com
485f2c93c2
Merge mysql.com:/home/jimw/my/mysql-5.0-10214
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 09:47:20 -07:00
jimw@mysql.com
de55960430
Add documentation to the escape_*() functions in mysys.
2005-07-05 09:45:32 -07:00
lars@mysql.com
983f9040c6
Merge mysql.com:/home/bkroot/mysql-5.0
...
into mysql.com:/home/bk/mysql-5.0
2005-07-05 17:56:51 +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
0449ee1ca8
Merging 4.1 into 5.0
2005-07-05 16:02:03 +02:00
lars@mysql.com
18e4d744d7
Merge mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/bk/mysql-5.0
2005-07-05 15:39:49 +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
bell@sanja.is.com.ua
4bc6bd38ec
Merge
2005-07-05 13:42:19 +03:00
bell@sanja.is.com.ua
5eb8404c57
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug5-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-07-05 13:39:20 +03:00
bell@sanja.is.com.ua
cee0f3f608
fixed environment creation and cleaning up for processing view one by one during checking (BUG#11337)
2005-07-05 13:37:02 +03:00
bell@sanja.is.com.ua
bfbd0e241b
added processing of view grants to table grants (BUG#9795)
2005-07-05 13:36:36 +03: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
mskold@mysql.com
883efd7e24
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-07-05 12:22:36 +02:00
marko@hundin.mysql.fi
e28797220f
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/marko/mysql-5.0-current
2005-07-05 12:24:05 +03:00
bell@sanja.is.com.ua
6f2fb9ea71
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-5.0
2005-07-05 12:24:04 +03:00
bell@sanja.is.com.ua
2e96c47a82
post-merge fixes
2005-07-05 12:23:13 +03:00
marko@hundin.mysql.fi
3760b8acfe
InnoDB: Fix compile-pentium-debug-max compilation problem.
2005-07-05 12:10:20 +03:00
bell@sanja.is.com.ua
15d02e60e1
merge
2005-07-05 11:38:05 +03:00
bell@sanja.is.com.ua
a8e9ca1b51
merge
2005-07-05 11:21:47 +03:00
mskold@mysql.com
bfa7f55d3c
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-07-05 10:01:27 +02:00
lenz@mysql.com
c505134699
- removed Docs/README.1st (it's obsolete)
2005-07-05 09:15:37 +02:00
gbichot@production.mysql.com
951eff4213
Merge gbichot@bk-internal:/home/bk/mysql-5.0
...
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod-gcc
2005-07-05 01:40:38 +02:00
lenz@mysql.com
9a4ae6f7ed
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-07-05 01:40:37 +02:00
gbichot@production.mysql.com
2f367fee25
Merge gbichot@bk-internal:/home/bk/mysql-5.0
...
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod-gcc
2005-07-05 01:40:37 +02:00
sergefp@mysql.com
a5019cc39c
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-jul4
2005-07-04 23:40:36 +00:00
sergefp@mysql.com
3d5d366c72
BUG#9814: post-review fixes: clear thd->net.no_send error after SP instruction
...
execution, not before.
2005-07-04 23:40:01 +00:00
sergefp@mysql.com
4a90f7d04f
Fix for BUG#9814: Clear thd->net.no_send_error before each SP instruction
...
execution. Failure to do so caused the erroneous statements to send nothing
and hang the client.
2005-07-04 23:00:23 +00:00
gbichot@production.mysql.com
9cfdf2861a
Making rpl_until more robust if machine is slow. Removing rpl_trunc_binlog
...
which is wrong now that slave recovers gracefully from a crashed binlog (thx Serg).
stat -> my_stat in my_copy.c so that failing stat() does not hang client connection.
2005-07-04 22:27:16 +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
1e399654b4
Merge mysql.com:/space/my/mysql-4.1-build
...
into mysql.com:/space/my/mysql-5.0-build
2005-07-04 22:14:14 +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