mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24468 commits 2781 branches 343 tags 1.6 GiB
Commit graph

24468 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
mskold@mysql.com
77c481329c Fixed indentation 2005-07-04 20:36:38 +02:00
lenz@mysql.com
d42a35935d Merge mysql.com:/space/my/mysql-5.0 
into mysql.com:/space/my/mysql-5.0-build
 2005-07-04 17:46:28 +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
a7759de8d0 Merge mysql.com:/space/my/mysql-4.1-merge 
into mysql.com:/space/my/mysql-5.0-build
 2005-07-04 16:43:55 +02:00
lenz@mysql.com
8ef5ad5364 - manual merge 2005-07-04 16:05:20 +02:00
marko@hundin.mysql.fi
774916a902 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0-current
 2005-07-04 16:12:08 +03:00
monty@mysql.com
5b8683db74 After merge fixes 2005-07-04 16:01:04 +03: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
monty@mysql.com
fe30ec9032 manual merge 2005-07-04 03:50:04 +03:00
monty@mysql.com
ec420bfb43 Fixes during review of new code 
- Mostly indentation fixes
- Added missing test
- Ensure that Item_func_case() checks for stack overruns
- Use real_item() instead of (Item_ref*) item
- Fixed wrong error handling
 2005-07-04 03:42:33 +03:00
monty@mysql.com
75ff7d8085 After merge fixes 
Better fix for ON DUPLICATE KEY UPDATE
 2005-07-04 03:24:25 +03: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
86d7b02199 Merge with 4.1 2005-07-03 14:17:52 +03:00
bell@sanja.is.com.ua
2941da3971 do not register changes of stack variable 2005-07-03 00:51:02 +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
bell@sanja.is.com.ua
40abfc1b6f fixed var_samp printing (BUG#10651) 2005-07-02 16:12:32 +03:00
bell@sanja.is.com.ua
6201504db9 fixed difference between ps-protocol and usual execution 2005-07-02 13:16:30 +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