mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
26124 commits 2791 branches 343 tags 1.7 GiB
Commit graph

26124 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
msvensson@neptunus.(none)
ced32517c7 Bug #3131 mysqltest fails on $2=$1 assignment in test 2005-09-01 10:53:33 +02:00
msvensson@neptunus.(none)
906f7c4481 Bug #12471 mysqltest, --error within loop affects wrong statement 
- Move clearing of expected errors
 2005-09-01 09:34:40 +02:00
msvensson@neptunus.(none)
211b78b6ee Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-01 09:05:45 +02:00
msvensson@neptunus.(none)
4b5ca92631 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-09-01 09:01:15 +02:00
jimw@mysql.com
d6db387aea Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-31 19:12:16 -07:00
jimw@mysql.com
c3f4ecb544 Merge mysql.com:/home/jimw/my/mysql-4.1-7156 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-31 18:34:16 -07:00
jimw@mysql.com
0ebf1576dc Merge mysql.com:/home/jimw/my/mysql-4.1-12325 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-31 18:32:45 -07:00
jimw@mysql.com
00b17c1c17 Fix handling of filenames that start the same as reserved filenames 
on Windows. (Bug #12325)
 2005-08-31 18:32:15 -07:00
jimw@mysql.com
1d997477aa Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-31 15:24:06 -07:00
tomas@poseidon.ndb.mysql.com
e0f3c5c0fb Bug #12043, do not core on misconfig unless debug compiled 2005-09-01 00:13:01 +02:00
tomas@poseidon.ndb.mysql.com
29dc269678 Bug#12833 corrected parsing of CLUSTERLOG command in ndb_mgm 2005-08-31 23:56:02 +02:00
tomas@poseidon.ndb.mysql.com
f1b97218f1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-08-31 23:31:02 +02:00
tomas@poseidon.ndb.mysql.com
ce91c0f1c8 added make of ndb sys file printer 2005-08-31 23:24:50 +02:00
evgen@moonbone.local
c23c1dc314 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/12861-bug-4.1-mysql
 2005-09-01 01:08:59 +04:00
tomas@poseidon.ndb.mysql.com
9a91368997 improved the ndb redo log reader 2005-08-31 23:08:58 +02:00
evgen@moonbone.local
41fc00641c create.test, create.result, sql_select.cc, item.cc: 
After merge fix for bug #12537
 2005-08-31 22:06:34 +04:00
evgen@moonbone.local
f917803e0c Manual merged 2005-08-31 21:24:25 +04:00
jimw@mysql.com
2ef8b1e7de Fix quoting of options passed to external commands by mysqld_multi. (Bug #11280) 2005-08-31 10:23:29 -07:00
jimw@mysql.com
37bf8394ab Add test for madvise() being declared in C++ code, because it is not 
on Solaris even though it is available, and declare it ourselves in
that case. (Bug #7156)
 2005-08-31 10:08:55 -07:00
tomas@poseidon.ndb.mysql.com
298af8ccb9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-08-31 18:50:33 +02:00
msvensson@neptunus.(none)
d692f0c045 Remove syntax !$<err_no> to set an expected error code 
Use !<err_no> instead
 2005-08-31 18:10:26 +02:00
lars@mysql.com
7fd89c85b7 BUG#12542: All set statements should be executed by slave thd 
rpl_replicate_do.result:
  New test case
sql_parse.cc:
  All SET statements should be executed by slave thd
rpl_replicate_do.test:
  New test case
 2005-08-31 18:08:45 +02:00
msvensson@neptunus.(none)
2fc6ef3a40 BUG#11316: mysqltest, problems when assigning value with '#' to $variable 
- Add stricter checking of syntax in mysqltest
 2005-08-31 17:16:05 +02:00
SergeyV@selena.
341eac5d25 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  selena.:H:/MYSQL/src/#11815-mysql-5.0
 2005-08-31 18:44:02 +04:00