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

20260 commits

This branch
This branch
All branches
Author SHA1 Message Date
paul@snake-hub.snake.net
31d7f7b0b5 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
 2006-03-01 18:38:19 -06:00
paul@snake-hub.snake.net
fe613502af README: 
revise README.
 2006-03-01 18:37:41 -06:00
paul@snake-hub.snake.net
32bdb2cc72 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
 2006-03-01 17:55:41 -06:00
paul@snake-hub.snake.net
be887ea830 README.gcov: 
Revise README.gcov.
 2006-03-01 17:55:10 -06:00
paul@snake-hub.snake.net
3b67fdf5f5 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
 2006-03-01 17:41:34 -06:00
paul@snake-hub.snake.net
98f1d2d33e Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
 2006-03-01 17:37:49 -06:00
paul@snake-hub.snake.net
7b4f0dc8b0 README: 
Revise mysql-test README.
 2006-03-01 17:37:07 -06:00
joerg@mysql.com
4b29ce6053 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/M40/comment-4.0
 2006-03-01 20:13:23 +01:00
joerg@mysql.com
1b698f03e4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/comment-4.1
 2006-03-01 17:43:16 +01:00
bar@mysql.com
a6973ceed0 Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE) 
union.result, union.test:
  Adding test case.
item.cc:
  Allow safe character set conversion in UNION
  - string constant to column's charset
  - to unicode
  Thus, UNION now works the same with CONCAT (and other string functions)
  in respect of aggregating arguments with different character sets.
 2006-03-01 17:58:01 +04:00
joerg@mysql.com
38a7f5551a mysql-test/mysql-test-run.pl : Add a "--comment=<string>" option (backport from 5.1). 2006-03-01 13:15:37 +01:00
joerg@mysql.com
21a57a8f85 Merge mysql.com:/M40/comment-4.0 into mysql.com:/M41/comment-4.1 2006-03-01 13:10:59 +01:00
joerg@mysql.com
0afe7f1987 mysql-test/mysql-test-run.sh : Add a "--comment=<string>" option, to get it logged when the test is run. 2006-03-01 12:21:44 +01:00
paul@snake-hub.snake.net
7f7f5969c0 mysqltest.test: 
Add real_sleep tests.
 2006-02-28 17:54:11 -06:00
paul@snake-hub.snake.net
d6654fe9cb mysql-test-run.sh: 
Fix URLs.
README:
  Fix URL.
mysqltest.result:
  Update test result for real_sleep error message.
mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.
 2006-02-28 15:08:16 -06:00
paul@snake-hub.snake.net
fc8ed82da4 mysqltest.c: 
Correct/clarify comments.
 2006-02-28 14:00:17 -06:00
paul@snake-hub.snake.net
6d4dc91bbf mysqltest.c: 
Fix typos.
 2006-02-28 12:01:24 -06:00
konstantin@mysql.com
7178f247f5 Remove 'delayed' to make the test deterministic (already 
fixed in 5.0).
A post-review fix (Bug#13134)
 2006-02-23 23:41:15 +03:00
konstantin@mysql.com
442c2ba8af A fix and a test case for Bug#13134 "Length of VARCHAR() utf8 
column is increasing when table is recreated with PS/SP":
make use of create_field::char_length more consistent in the code.
Reinit create_field::length from create_field::char_length
for every execution of a prepared statement (actually fixes the 
bug).
 2006-02-21 19:52:20 +03:00
ingo@mysql.com
718ae78972 Bug#11527 - Setting myisam_repair_threads to >1 leads to corruption 
A wrong cast led to numeric overflow for data files
greater than 4GB. The parallel repair assumed end of
file after reading the amount of data that the file
was bigger than 4GB. It truncated the data file and
noted the number of records it found so far in the
index file header as the number of rows in the table.
Removing the cast fixed the problem.
I added some cosmetic changes too.

The normal repair worked because it uses a different
function to read from the data file.
 2006-02-16 19:45:57 +01:00
jimw@mysql.com
e75a62aeae Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2006-02-15 07:36:33 -08:00
jimw@mysql.com
d70c47b2a9 Merge mysql.com:/home/jimw/my/mysql-4.1-16389 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2006-02-14 18:12:30 -08:00
aelkin@mysql.com
a744ab78ba Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
 2006-02-13 21:47:23 +02:00
joerg@mysql.com
678e075ecf Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/rpmspec-4.1
 2006-02-13 18:23:08 +01:00
aelkin@mysql.com
0866e4267a Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
 2006-02-13 19:15:02 +02:00
SergeyV@selena.
b0136378cf Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  selena.:H:/MYSQL/src/#06536-mysql-4.1
 2006-02-13 17:29:35 +03:00
kent@mysql.com
eec5726806 make_binary_distribution.sh: 
print => echo in shell script
 2006-02-12 01:33:43 +01:00
knielsen@mysql.com
9025342992 Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/mysql/mysql-4.1-fixrace
 2006-02-12 00:19:59 +01:00
kent@mysql.com
2619c54bd1 mysql-test-run.{pl,sh}: 
Give space for second and third slave port
 2006-02-11 23:35:23 +01:00
knielsen@mysql.com
43189fd8ad Fix a race on some platforms in mysql-test-run.pl, where it would sometimes 
errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.
 2006-02-11 22:50:59 +01:00
kent@mysql.com
d23d02be18 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2006-02-10 19:18:45 +01:00
tomas@poseidon.ndb.mysql.com
cbac75de91 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2006-02-10 17:53:13 +01:00
tomas@poseidon.ndb.mysql.com
7050a7586e Bug #17249 ndb, delete statement with join where clause fails when table do not have pk 
Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
 2006-02-10 17:40:22 +01:00
joerg@mysql.com
ceaf0017e3 support-files/mysql.spec.sh : Use "-i" on "make test-force", essential for log file evaluation. 2006-02-10 17:40:04 +01:00
aelkin@mysql.com
14ced05e55 BUG#16217 fix partly backported from 5.0. It is different in mysqlbinlog part. 
This changeset is assumed to stay in 4.1.
 2006-02-10 15:12:27 +02:00
jonas@perch.ndb.mysql.com
1aced6dfe4 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
 2006-02-10 09:42:35 +01:00
jonas@perch.ndb.mysql.com
088c7d4268 bug#10987 - ndb - unable to find restorable replica 
Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
    
  This variable is used when cutting redo (calcKeepGci)
  
  Also make sure complete GCI is run inbetween LCP's
 2006-02-10 09:37:36 +01:00
jonas@perch.ndb.mysql.com
d9e402ef52 bug#17295 - ndb - error while reading REDO log 
fix corruption due to page 0, file 0 gets released
 2006-02-10 09:17:53 +01:00
ramil@mysql.com
34abab41db Removed 'delayed' to make the test deterministic (as the bug itself has nothing to do with 'delayed'). 2006-02-08 16:00:39 +04:00
bell@sanja.is.com.ua
84900213dd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2006-02-07 14:23:16 +02:00
bell@sanja.is.com.ua
5923d50533 kill.test fixed for kill on Mac OS X (which do not send OK) 2006-02-07 13:45:16 +02:00
svoj@april.(none)
0488462a58 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
 2006-02-07 14:49:57 +04:00
tomas@poseidon.ndb.mysql.com
06a57659d8 Bug #17081 "LOAD DATA INFILE" may not load all the data 2006-02-07 11:30:42 +01:00
svoj@april.(none)
91296df576 Merge april.(none):/home/svoj/devel/mysql/BUG16893/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
 2006-02-07 13:49:55 +04:00
svoj@april.(none)
a67d8f9043 Merge april.(none):/home/svoj/devel/mysql/BUG14496/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
 2006-02-07 13:49:03 +04:00
tomas@poseidon.ndb.mysql.com
5bbb5c29b7 Bug #17154 load data infile of char values into a table of char(PK) hangs 
Bug #17158  	load data infile of char values into table of char with no (PK) fails to load
Bug #17081  	Doing "LOAD DATA INFILE" directly after delete can cause missing data
 2006-02-07 00:03:39 +01:00
jonas@perch.ndb.mysql.com
78bd6d93af bug#13966 - ndb 
better error message on invalid config change
 2006-02-06 11:42:44 +01:00
jonas@perch.ndb.mysql.com
155081e425 bug#13965 
ndb - error while restarting in dict
        improve error message when changed config leads to failed restart
 2006-02-06 11:30:56 +01:00
pekka@mysql.com
8ed86030b4 ndb - bug#16693 (4.1) test + workaround, analyze later 2006-02-05 22:12:06 +01:00
pekka@mysql.com
c696582df4 ndb - replace+tinyblob back-patch from 5.0 [ discard on 4.1->5.0 merge ] 2006-02-03 15:23:58 +01:00