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
24281 commits 2781 branches 343 tags 1.6 GiB
Commit graph

24281 commits

This branch
This branch
All branches
Author SHA1 Message Date
bell@sanja.is.com.ua
a8e9ca1b51 merge 2005-07-05 11:21:47 +03: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
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
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
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
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
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
heikki@hundin.mysql.fi
8bc2fbb0f8 row0sel.c: 
Optimize speed: no need to keep track of set new rec locks in a consistent read
 2005-07-02 00:39:47 +03:00
heikki@hundin.mysql.fi
a9cf7ad0d1 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-07-01 23:16:28 +03:00
heikki@hundin.mysql.fi
44c0f57d53 trx0trx.h, trx0trx.ic, row0mysql.c: 
Fix another bug in the fix of Bug #3300
 2005-07-01 22:53:08 +03:00
heikki@hundin.mysql.fi
50eab8cf01 trx0trx.ic, trx0trx.h: 
Fix bug in the Bug #3300 bug fix
 2005-07-01 21:06:23 +03:00
heikki@hundin.mysql.fi
4fe03b705a Many files: 
Fix Bug #3300 : if innodb_locks_unsafe_for_binlog is set, release locks on rows that we do not UPDATE or DELETE
 2005-07-01 20:44:35 +03: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
svoj@mysql.com
a834b69259 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/svoj/devel/mysql/yassl1-mysql-5.0
 2005-07-01 21:40:57 +05:00
pem@mysql.com
549399ee9e Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-07-01 17:01:03 +02:00
konstantin@mysql.com
88603a0edc Fix a crash I introduced by the last push. 2005-07-01 19:01:02 +04:00
svoj@mysql.com
9359cec4ca WL#2286 - Compile MySQL w/YASSL support 
Merge with latest yaSSL. It includes fix for bigendian/littleendian
problem (fixes func_encrypt test failure). Our trees are in sync now.
 2005-07-01 20:00:59 +05:00
pem@mysql.com
9f1bb68b77 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-07-01 16:13:36 +02:00
msvensson@neptunus.(none)
23f964b9e6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-07-01 16:11:30 +02:00
pem@mysql.com
8a85dcd1cc Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-07-01 15:52:42 +02:00
konstantin@mysql.com
f09b4b969c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-11172-new
 2005-07-01 17:52:41 +04:00
konstantin@mysql.com
402df62bf7 Fix a valgrind warning. 2005-07-01 17:51:04 +04:00
igor@rurik.mysql.com
b46b232f3f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-07-01 06:42:39 -07:00
msvensson@neptunus.(none)
ead7b076dc Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-07-01 15:40:42 +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
pem@mysql.com
481bb717d7 Disabled the GOTO feature. (It's non-standard and undocumented.) 
We want to have the defacto standard syntax for labels ("L:" instead of "label L;"),
and fix some known bugs, before we enable this again.
The code is left intact (#ifdef'ed SP_GOTO) and the test cases are kept in
sp-goto.test, for the future...
 2005-07-01 15:25:51 +02:00