mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
26046 commits 2784 branches 343 tags 1.6 GiB
Commit graph

26046 commits

This branch
This branch
All branches
Author SHA1 Message Date
jonas@eel.(none)
b267176708 ndb - bug#12608 
Always abort if node failure occured between startTransaction and commit
  (can later be improved by wl#2610)
 2005-09-02 11:50:50 +02:00
jonas@eel.(none)
3a555b999c ndb - bug #10987 
make sure not to cut log to early 
  (specificly not use LCP with maxGciStarted that has not yet completed)
 2005-09-02 11:47:24 +02:00
msvensson@neptunus.(none)
375dc1531c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-09-02 11:21:59 +02:00
msvensson@neptunus.(none)
d2d1d01f76 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-02 11:19:46 +02:00
msvensson@neptunus.(none)
78f32604ac mysqltest.test: Remove output from shells in result file 2005-09-02 11:14:47 +02:00
kent@mysql.com
5b65d8fb03 my_global.h: 
Back port of QNX work around for rint()
 2005-09-02 11:11:29 +02:00
stewart@mysql.com
bfd4b626a1 BUG#11607 Incorrect error code returned on deletion 
Save error on first failure.
    
At end of execute, if the current error is 4350 (transaction already aborted), restore
the original error (if there was one).
 2005-09-02 19:09:20 +10:00
lars@mysql.com
198350d630 Merge mysql.com:/users/lthalmann/bk/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/mysql-5.0
 2005-09-02 11:01:00 +02:00
kent@mysql.com
5e5184752d configure.in: 
Back port of code to find the right 'ps' settings
 2005-09-02 10:44:20 +02:00
bar@mysql.com
98a5362c1e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b12363
 2005-09-02 12:01:19 +05:00
bell@sanja.is.com.ua
cb0d8ade1e Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
 2005-09-02 09:55:24 +03:00
bell@sanja.is.com.ua
2434c8af4b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
 2005-09-02 09:51:32 +03:00
bell@sanja.is.com.ua
da64c1eab3 postmerge changes 2005-09-02 09:50:17 +03:00
msvensson@neptunus.(none)
d0a78f4dcc Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-02 08:38:48 +02:00
bar@mysql.com
5e3eb3d21e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b12363
 2005-09-02 11:19:43 +05:00
bar@mysql.com
50f622ab04 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-09-02 10:40:06 +05:00
bar@mysql.com
252ed3a24c sp_head.cc: 
Fix crash reported in bug 12849.
  It doesn't fix the whole problem though.
  Let Pem fix it later.
 2005-09-02 10:35:51 +05:00
lars@mysql.com
9d8f51fe3a Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/mysql-4.1-bug12542
 2005-09-02 01:37:16 +02:00
dlenev@mysql.com
c30c632117 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-09-02 01:23:31 +04:00
dlenev@mysql.com
9dcae4c09b Fixes after merging fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES 
and GRANT in multi-threaded environment" into 5.0 tree.
 2005-09-02 01:01:33 +04:00
joerg@mysql.com
541b65ef64 Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M40/mysql-4.0 2005-09-01 22:23:09 +02:00
joerg@mysql.com
4b677dfa59 Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M50/merge-5.0 2005-09-01 21:54:18 +02:00
joerg@mysql.com
1c07995d8a Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/merge-5.0 2005-09-01 21:48:10 +02:00
bell@sanja.is.com.ua
dd7ab17059 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
 2005-09-01 22:42:37 +03:00
joerg@mysql.com
163ead846e Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M41/merge-4.1 2005-09-01 21:36:16 +02:00
dlenev@mysql.com
d23732962f Merge mysql.com:/home/dlenev/src/mysql-4.1-bg12423 
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-09-01 23:25:29 +04:00
joerg@mysql.com
54e797a27d Manual merge. 2005-09-01 21:06:37 +02:00
msvensson@neptunus.(none)
f1f45919c9 Fix missing command terminator 2005-09-01 20:49:06 +02:00
msvensson@neptunus.(none)
d6b705dd8e Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-09-01 20:13:42 +02:00
msvensson@neptunus.(none)
1026fa2fe3 Fix for spelling miss and eol junk 2005-09-01 20:02:08 +02:00
joerg@mysql.com
0a2e013c9d Add "MYSQL_BASE_VERSION" to the list of substituted variables in the "scripts" subdirectory. 2005-09-01 20:01:21 +02:00
lars@mysql.com
6a91b15b8e Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/mysql-4.1-bug12542
 2005-09-01 19:03:09 +02:00
lars@mysql.com
9dd14fc381 BUG#12542: Added comments 2005-09-01 17:58:00 +02:00
msvensson@neptunus.(none)
544273f9e8 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-01 17:29:49 +02:00
msvensson@neptunus.(none)
28f529d91f Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
 2005-09-01 17:21:03 +02:00
msvensson@neptunus.(none)
305dc01078 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
 2005-09-01 17:15:37 +02:00
msvensson@neptunus.(none)
4b47ebcfc9 mysqltest improvements, updates after merge + test for 5.0 2005-09-01 17:01:23 +02:00
dlenev@mysql.com
0683c122b6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/dlenev/src/mysql-4.1-bg12423
 2005-09-01 17:01:25 +04:00
dlenev@mysql.com
da2af0bb6d Fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in 
multi-threaded environment".

To avoid deadlocks between several simultaneously run account management 
commands (particularly between FLUSH PRIVILEGES/SET PASSWORD and GRANT
commands) we should always take table and internal locks during their
execution in the same order. In other words we should first open and lock
privilege tables and only then obtain acl_cache::lock/LOCK_grant locks.
 2005-09-01 16:52:59 +04:00
msvensson@neptunus.(none)
9782004002 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-01 14:49:11 +02:00
msvensson@neptunus.(none)
68778715ae Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug11286/my50-bug11286
 2005-09-01 14:47:06 +02:00
kent@mysql.com
b6889a4e72 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-09-01 14:45:39 +02:00
kent@mysql.com
1a5f346bf9 mtr_process.pl: 
Make sure mtr_kill_processes() is called with an array ref
  Corrected error string for STDERR redirect
 2005-09-01 14:32:42 +02:00
pekka@mysql.com
d78eee0376 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/export/space/pekka/ndb/version/my50
 2005-09-01 14:23:46 +02:00
pekka@mysql.com
cf626c2000 ndb - fix ha_ndb crash on ordered index on nullable varchar 2005-09-01 14:12:48 +02:00
msvensson@neptunus.(none)
e6b282d9f8 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
 2005-09-01 14:09:23 +02:00
msvensson@neptunus.(none)
6fb7881f06 Bug #12717 yassl: Crashes in "integer.cpp" when compiled with icc 
- Temporary fix, disable x86 assembler.
 2005-09-01 14:07:45 +02:00
msvensson@neptunus.(none)
61be2a143d Merge neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316 
into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
 2005-09-01 12:53:23 +02:00
msvensson@neptunus.(none)
8c0f7f82d9 Bug #11286 yassl incompatible with "load data infile" 
- Make sure that mysqltest always uses ssl when connecting to the server.
 - Pass a i32-bit int variable as argument to FIONREAD ioctl.
 2005-09-01 11:46:43 +02:00
msvensson@neptunus.(none)
72b08b7e57 Fix compiler warnings for mysqltest.c 2005-09-01 11:11:10 +02:00