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
19501 commits 2791 branches 343 tags 1.7 GiB
Commit graph

19501 commits

This branch
This branch
All branches
Author SHA1 Message Date
bar@mysql.com
6a5f00702d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b9948
 2005-09-05 20:05:32 +05:00
msvensson@neptunus.(none)
7f848c1784 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
 2005-09-05 17:01:15 +02:00
bar@mysql.com
0eafb9572a mysqld.cc, mysql_priv.h, sql_parse.cc: 
bug#9948
  changed client-charset behavior in 4.1.x libmysql, which issue BC prob
  after review fixes
 2005-09-05 20:00:11 +05:00
tulin@dl145b.mysql.com
32a3dd850b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into dl145b.mysql.com:/home/ndbdev/mysql-4.1
 2005-09-05 16:54:44 +02:00
msvensson@neptunus.(none)
72228ea825 Bug#12959 mysqltest crashes if testcase passed with -x option 2005-09-05 16:50:32 +02:00
tulin@dl145b.mysql.com
d5d360b180 added --core-file option to ndb executables 
added parseable printout in ndb_restore
 2005-09-05 16:33:40 +02:00
evgen@moonbone.local
7493f615d8 func_gconcat.test, func_gconcat.result: 
Test case for bug #12859 group_concat in subquery cause incorrect not null.
 2005-09-05 17:58:29 +04:00
tulin@dl145b.mysql.com
7573d04323 Bug #12992 Cluster StopOnError = Y restarts ndbd indefinitly 2005-09-05 15:14:44 +02:00
ramil@mysql.com
0f34207606 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b4214
 2005-09-05 16:41:01 +05:00
ramil@mysql.com
1fb4441782 a fix (bug #4214: Table corruption with myisampack and large BLOB objects). 2005-09-05 16:31:42 +05:00
msvensson@neptunus.(none)
6f8e870ca6 Remove extra ; 2005-09-05 12:33:25 +02:00
joerg@mysql.com
f12663ec79 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2005-09-05 09:58:34 +02:00
tulin@dl145b.mysql.com
c83eedc829 added timestamp to shutdown messages in ndbd 2005-09-05 09:29:28 +02:00
tulin@dl145b.mysql.com
3c6ec2a98e fixed small bug in ndb redolog printer 
+ added option to dumpe rest of page after exnd of data
 2005-09-05 09:13:28 +02:00
jonas@eel.(none)
613258e0b4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-09-03 07:58:43 +02:00
eric@mysql.com
5a8af4cb9e Backport of JimW's localhost patch to 4.1 tree. 
Handle systems like default FC4 where 127.0.0.1 doesn't always map to 'localhost' first. 
(Bug #11822)
 2005-09-02 17:07:05 -07:00
hartmut@mysql.com
14485e71c2 fix for BUG#12958 : mysqlimport with -L option crashing on HP-UX 2005-09-02 22:52:52 +02:00
jimw@mysql.com
9dc0da7c46 Merge mysql.com:/home/jimw/my/mysql-4.1-11280 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-09-02 12:12:36 -07:00
joerg@mysql.com
ed093d581a Compile error fix. 2005-09-02 20:07:08 +02:00
jonas@eel.(none)
03f7901193 Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-09-02 12:06:43 +02:00
jonas@eel.(none)
4b80ed1bde ndb - fix printout related to bug#10987 2005-09-02 11:55:41 +02:00
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)
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
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
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
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
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
163ead846e Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M41/merge-4.1 2005-09-01 21:36:16 +02: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
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)
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
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
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
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)
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
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