mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-26 08:44:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
30961 commits 2779 branches 343 tags 1.6 GiB
Commit graph

8533 commits

Author SHA1 Message Date
pekka@mysql.com
14249f23ed Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-02-07 21:52:56 +01:00
bell@sanja.is.com.ua
6916a4bfe6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-02-07 22:10:44 +02:00
gunnar@mysql.com.
f6590a3b89 Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com.:/data/BK/mysql-5.0
 2006-02-07 20:50:28 +01:00
pekka@mysql.com
05353723f0 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-02-07 20:04:54 +01:00
msvensson@neptunus.(none)
4ddcc7ccc2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
 2006-02-07 20:02:08 +01:00
msvensson@neptunus.(none)
ba6b1a6e9b Removed extra "drop view v1" 2006-02-07 19:59:19 +01:00
pekka@mysql.com
9aa06f3bc1 ndb - bug#15918 fix 2006-02-07 19:57:31 +01:00
andrey@lmy004.
64c34f101f Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-events_i_s
 2006-02-07 19:37:26 +01:00
andrey@lmy004.
4ba2a3322b - fix for bug #16414 (Events: Crash or hang if event drops itself) 
WL#1034 (Internal CRON)
(with post-review fix)
 2006-02-07 19:28:33 +01:00
jmiller@mysql.com
e5a7238aed 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-07 19:19:42 +01:00
msvensson@neptunus.(none)
cc1fd81414 Update after merge 5.0 -> 5.1 2006-02-07 19:18:33 +01:00
tomas@poseidon.ndb.mysql.com
99cbc34b44 Bug #17188 CRBR: ignores --binlog_ignore_db= settings 2006-02-07 19:02:38 +01:00
jmiller@mysql.com
a20976ffd9 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-07 18:25:18 +01:00
msvensson@neptunus.(none)
bbff8ade1a Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my51-mysqltest_float_result 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
 2006-02-07 18:17:57 +01:00
msvensson@neptunus.(none)
bcefb0c7fa Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
 2006-02-07 18:04:50 +01:00
msvensson@neptunus.(none)
3f1cf9fabc Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
 2006-02-07 17:57:26 +01:00
lars@mysql.com
2600ad852a Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
 2006-02-07 17:45:11 +01:00
msvensson@neptunus.(none)
809deba6e5 Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases 
into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
 2006-02-07 17:20:50 +01:00
gunnar@mysql.com.
a0b0cb5551 Merge mysql.com.:/data/BK/mysql-5.0 
into  mysql.com.:/data/BK/mysql-5.0_8461_b
 2006-02-07 17:15:12 +01:00
jmiller@mysql.com
54e07cea2e More rpl test updates with using ndb as default engine 2006-02-07 14:51:46 +01:00
konstantin@mysql.com
30ddc47ab0 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-07 15:26:58 +03:00
gunnar@mysql.com.
001224c09d item_func.cc: 
fix for bug#8461

  BUG 8461 - TRUNCATE returns incorrect result if 2nd argument is negative
  Reason: Both TRUNCATE/ROUND converts INTEGERS to DOUBLE and back to INTEGERS
  Changed the integer routine to work on integers only.
  This bug affects 4.1, 5.0 and 5.1
  Fixing in 4.1 will need to change the routine to handle different types individually.
  5.0 did had different routines for different types already just the INTEGER routine was bad.
 2006-02-07 13:26:35 +01: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)
328b59a5ed Merge april.(none):/home/svoj/devel/mysql/merge/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0
 2006-02-07 15:30:32 +04:00
jmiller@mysql.com
b135439097 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-07 12:16:26 +01:00
lars@mysql.com
caf1fb4b03 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-02-07 11:47:05 +01:00
tomas@poseidon.ndb.mysql.com
407d98b946 Bug#17081 LOAD DATA INFILE" may not load all the data 
Bug #17154  	load data infile hangs when duplicate key encountered
 2006-02-07 11:47:04 +01: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
jmiller@mysql.com
23b68e3a5a More test case updates for using RPL with NDB as default engine 2006-02-07 00:18:10 +01:00
tomas@poseidon.ndb.mysql.com
3f6671d72a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-07 00:06:28 +01: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
igor@rurik.mysql.com
b25b4e9b5e Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-06 11:40:39 -08:00
igor@rurik.mysql.com
3af0eabc7f Fixed bug #16203. 
If check_quick_select returns non-empty range then the function cost_group_min_max
cannot return 0 as an estimate of the number of retrieved records.
Yet the function erroneously returned 0 as the estimate in some situations.
 2006-02-06 11:35:13 -08:00
lars@mysql.com
6697e6aff3 Two new tests for replace_regex 2006-02-06 18:25:12 +01:00
pem@mysql.com
c289a3b60e Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0
 2006-02-06 17:58:15 +01:00
sergefp@mysql.com
0fa18a4623 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/psergey/mysql-5.1-wl2985-postfixes
 2006-02-06 19:11:14 +03:00
sergefp@mysql.com
a906e3c62d WL#2985 "Partition pruning", "do pruning for UPDATE/DELETE": Post-merge fixes 2006-02-06 18:33:39 +03:00
pem@mysql.com
62d2511df5 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0
 2006-02-06 16:07:13 +01:00
pem@mysql.com
5debbc9e8a Updated sp-code.result after merge (BUG#16568) 2006-02-06 16:05:46 +01:00
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
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
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