mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
30848 commits 2785 branches 343 tags 1.6 GiB
Commit graph

10246 commits

Author SHA1 Message Date
jmiller@mysql.com
726076b8cb Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-02-06 15:59:37 +01:00
tomas@poseidon.ndb.mysql.com
cc47880702 harmonized mysql-test-run.sh and .pl 
+ added current test printout to error file
 2006-02-06 15:42:26 +01:00
petr@mysql.com
c29f832a68 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug
 2006-02-06 17:35:10 +03:00
pem@mysql.com
2d340a875c Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug16568/mysql-5.0
 2006-02-06 14:09:14 +01:00
anozdrin@mysql.com
0869f3b8a6 Fix merge (5.0 -> 5.1) of the patch for BUG#15166/15196. 2006-02-06 16:05:20 +03:00
jonas@perch.ndb.mysql.com
3c164107b0 bug#16767, bug#16768 - ndb missleading names of error codes 
rename error codes
 2006-02-06 13:27:16 +01:00
anozdrin@mysql.com
4d8a51ca9d Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rev-1.2004.2.1 
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-tree
 2006-02-06 15:23:17 +03:00
sergefp@mysql.com
60f2321b51 Merge 2006-02-05 23:49:32 +03:00
pekka@mysql.com
738db4f1a2 ndb - rbr blobs works now (or again) 2006-02-05 19:11:11 +01:00
aelkin@mysql.com
0c95fd2376 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/tmp_merge 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
 2006-02-04 11:06:17 +02:00
aelkin@mysql.com
217499df86 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
 2006-02-04 10:25:46 +02:00
konstantin@mysql.com
a55b7a9f13 A post-merge fix. 2006-02-03 23:21:17 +03:00
konstantin@mysql.com
5e03bf7f93 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-03 21:10:03 +03:00
ingo@mysql.com
8906937757 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg
 2006-02-03 17:57:23 +01:00
jmiller@mysql.com
cac41af212 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-02-03 16:06:20 +01:00
jmiller@mysql.com
43a9daf0b8 Implemented requested changes by Lars and did some general test cleanup. Lots more togo 2006-02-03 15:38:27 +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
pekka@mysql.com
7b892368c3 ndb - bugfix: tinyblob + replace => mysqld crash (no bug#) 2006-02-03 14:35:29 +01:00
petr@mysql.com
b221e37b7d Fix for Bug#16905 Log tables: unicode statements are logged incorrectly 2006-02-03 13:05:14 +03:00
igor@rurik.mysql.com
66b6c988f5 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-03 00:07:57 -08:00
igor@rurik.mysql.com
7b58b91fe4 Fixes after manual merge 2006-02-02 23:56:08 -08:00
igor@rurik.mysql.com
f61517d60b Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-02 21:23:36 -08:00
igor@rurik.mysql.com
3f9bb37461 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2006-02-02 17:39:38 -08:00
jmiller@mysql.com
4ae74a8133 First set of rpl test updated for NDB and general test cleanup 2006-02-03 01:59:02 +01:00
konstantin@mysql.com
cb7118edcd One more post-merge fix. 2006-02-03 02:01:01 +03:00
igor@rurik.mysql.com
b32ce5ac79 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-02 13:47:21 -08:00
konstantin@mysql.com
303ad65fb2 Post-merge fixes. 2006-02-03 00:07:36 +03:00
konstantin@mysql.com
9f0bb47f87 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 23:27:06 +03:00
dlenev@mysql.com
36e9bd0344 Merge mysql.com:/home/dlenev/src/mysql-5.1-bfix 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
 2006-02-02 22:12:06 +03:00
gunnar@mysql.com.
b413d72850 Merge mysql.com.:/data/BK/mysql-4.1_15828 
into  mysql.com.:/data/BK/mysql-5.0_15828
 2006-02-02 19:10:27 +01:00
tomas@poseidon.ndb.mysql.com
6e0d64565f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
 2006-02-02 16:44:22 +01:00
tomas@poseidon.ndb.mysql.com
ce8308a503 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
 2006-02-02 16:19:49 +01:00
konstantin@mysql.com
98091b152a Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-02-02 18:17:18 +03:00
tomas@poseidon.ndb.mysql.com
8978db5ec6 added more logging in ndb handler 
enable extra logging in ndb handler during test runs
 2006-02-02 16:12:18 +01:00
tomas@poseidon.ndb.mysql.com
a4357007cd disabled test because of bug, bug assigned and being worked on 2006-02-02 15:53:44 +01:00
tomas@poseidon.ndb.mysql.com
467720abf0 disbled sporadically failing testcase 2006-02-02 15:24:52 +01:00
dlenev@mysql.com
3fc6cf1494 Merge mysqldev@production.mysql.com:my/mysql-5.1-release/ 
into  mysql.com:/home/dlenev/src/mysql-5.1-bfix
 2006-02-02 13:53:35 +03:00
dlenev@mysql.com
5845476009 Yet another addition to the fix for BUG#9412 "Triggers: should have trigger 
privilege".

Corrected addition of TRIGGER privilege by "mysql_fix_privilege_tables" script.
Problem with it should have been caught by system_mysql_db/system_mysql_db_fix
tests but they were disabled. Enabled them back.
 2006-02-02 13:36:07 +03:00
tomas@poseidon.ndb.mysql.com
b40c942509 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-release 
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
 2006-02-02 11:13:36 +01:00
tomas@poseidon.ndb.mysql.com
92ffe8cf0d Bug #16753 DD: mysqldump does not support Cluster Disk Data backups 2006-02-02 10:56:04 +01:00
konstantin@mysql.com
065f8066d5 Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 12:03:35 +03:00
aelkin@mysql.com
d19f3f07e4 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
 2006-02-02 10:55:54 +02:00
msvensson@neptunus.(none)
dadc0ffc22 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-02 08:24:32 +01:00
msvensson@neptunus.(none)
264640c532 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-02 08:23:24 +01:00
elliot@mysql.com
e1759fea1b Post-merge fixes. 2006-02-02 00:37:42 -05:00
igor@rurik.mysql.com
86606615ab Fixed bug #16382. 
When an ambiguous field name is used in a group by clause a warning is issued
in the find_order_in_list function by a call to push_warning_printf.
An expression that was not always valid was passed to this call as the field
name parameter.
 2006-02-01 20:43:43 -08:00
elliot@mysql.com
d843b119d0 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
 2006-02-01 19:35:15 -05:00
tomas@poseidon.ndb.mysql.com
8c024b9072 Bug #16753 DD: mysqldump does not support Cluster Disk Data backups 2006-02-02 00:52:58 +01:00
elliot@mysql.com
9d282e31e4 Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
Null-merge InnoDB snapshots from 5.0 to 5.1
 2006-02-01 17:04:44 -05:00
dlenev@mysql.com
e4cf914b31 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
 2006-02-02 00:05:23 +03:00