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

30959 commits

This branch
This branch
All branches
Author SHA1 Message Date
evgen@moonbone.local
bb53b6eeaa Manually merged 2006-06-20 23:22:51 +04:00
evgen@moonbone.local
ae6970e6bc select.result: 
Added test case for bug#18759 Incorrect string to numeric conversion.  
select.test:
  Added test case for bug#18759 Incorrect string to numeric conversion.
item_cmpfunc.cc:
  Cleanup after fix for bug#18360 removal
 2006-06-20 23:05:55 +04:00
mats@mysql.com
e57e87980b Bug#19437 (Connection refused by server: "2002 Can't connect... /master.sock"): 
Clearing active VIO before calling mysql_close() in the slave I/O
thread.
 2006-06-20 20:46:45 +02:00
evgen@moonbone.local
1e0138fd3d Manually merged 2006-06-20 22:22:14 +04:00
elliot@mysql.com
6043f29810 Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/emurphy/mysql-5.0-heikki
 2006-06-20 13:44:36 -04:00
elliot@mysql.com
37e5ec9f50 Applying patch from SergeyV 
Fixes bug#17264, for alter table on win32 for successfull operation completion
it is used TL_WRITE(=10) lock instead of TL_WRITE_ALLOW_READ(=6), however here
in innodb handler TL_WRTIE is lifted to TL_WRITE_ALLOW_WRITE, which causes
race condition when several clients do alter table simultaneously.
 2006-06-20 13:43:13 -04:00
tomas@poseidon.ndb.mysql.com
10f873a2c3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-20 19:29:18 +02:00
tomas@poseidon.ndb.mysql.com
ffc60401db Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-20 19:25:41 +02:00
tomas@poseidon.ndb.mysql.com
f5f9f471d1 Bug #17297 Fix error messages 2006-06-20 19:13:46 +02:00
iggy@mysql.com
c6d2a56b22 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/mnt/storeage/mysql-5.0
 2006-06-20 11:32:16 -04:00
rburnett@bk-internal.mysql.com
e398d16677 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-06-20 14:53:20 +02:00
evgen@sunlight.local
d0d32f7d11 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into sunlight.local:/home/evgen/tmp_merge-5.0-opt-mysql
 2006-06-20 15:44:33 +04:00
evgen@moonbone.local
71f0fe3dca item_cmpfunc.cc: 
After merge fix
 2006-06-20 15:40:10 +04:00
evgen@moonbone.local
314b897fbf func_time.result: 
After merge fix
 2006-06-20 15:35:54 +04:00
gkodinov@mysql.com
f2471d8594 wrong merge of bug9676 from 4.1 to 5.0 corrected 2006-06-20 11:28:59 +03:00
stewart@mysql.com
337396d19a Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge
 2006-06-20 18:27:54 +10:00
stewart@mysql.com
9e05d61a48 BUG#20333 valgrind: mgmd event reporting dep on uninit value 2006-06-20 17:29:02 +10:00
ramil@mysql.com
c311fb0500 Merge mysql.com:/usr/home/ram/work/mysql-4.0 
into  mysql.com:/usr/home/ram/work/mysql-4.1
 2006-06-20 12:09:02 +05:00
ramil@mysql.com
d1fcc620d8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/mysql-4.1
 2006-06-20 09:35:25 +05:00
iggy@mysql.com
7d9a179c16 Bug#19407 Test 'func_regexp' fails on Windows x64 2006-06-19 22:19:05 -04:00
lars@mysql.com
1f5715af92 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
 2006-06-20 03:33:43 +02:00
lars@mysql.com
94019aed9f Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-20 00:13:20 +02:00
lars@mysql.com
cf2b170d00 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-20 00:08:12 +02:00
evgen@moonbone.local
217faf569e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-06-20 02:04:36 +04:00
evgen@moonbone.local
609e0dbd99 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-06-20 01:56:33 +04:00
evgen@moonbone.local
de8f05956d Merge 2006-06-20 00:52:26 +04:00
evgen@moonbone.local
279c310b66 item_cmpfunc.cc, func_in.result, func_in.test: 
Reverted fix for bug#18360
 2006-06-20 00:50:09 +04:00
holyfoot@deer.(none)
d8d42948b2 bug #20318 (ctype_ucs2_def test fails with embedded) 
there was two problems about charsets in embedded server
1. mysys/charset.c - defined there default_charset_info variable is
modified by both server and client code (particularly when
--default-charset option is handled)
In embedded server we get two codelines modifying one variable.
I created separate default_client_charset_info for client code

2. mysql->charset and mysql->options.charset initialization isn't
properly done for embedded server - necessary calls added
 2006-06-19 22:11:01 +05:00
rburnett@bk-internal.mysql.com
9fe129591c Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-06-19 18:00:54 +02:00
gkodinov@mysql.com
5508df251f Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error 
There was an incomplete reset of the name resolution context, that caused 
INSERT ... SELECT ... JOIN statements to resolve not by joint row type calculated
for the join.
Removed the redundant re-initialization of the context, because 
mysql_insert_select_prepare() now correctly saves/restores the context.
 2006-06-19 17:34:12 +03:00
anozdrin@mysql.com
e420873370 Merge mysql.com:/home/alik/MySQL/devel/5.0-rt 
into  mysql.com:/home/alik/MySQL/devel/5.0-tree-merged
 2006-06-19 18:10:04 +04:00
anozdrin@mysql.com
4afffb40a8 Merge mysql.com:/home/alik/MySQL/devel/5.0-tree 
into  mysql.com:/home/alik/MySQL/devel/5.0-rt
 2006-06-19 16:57:46 +04:00
svoj@may.pils.ru
2c28b3cbf1 Addition to fix for 
BUG#18036 - update of table joined to self reports table as crashed

Set exclude_from_table_unique_test value back to FALSE. It is needed for
further check in multi_update::prepare whether to use record cache.
 2006-06-19 17:50:52 +05:00
cmiller@bk-internal.mysql.com
b0ebd2fce0 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-maint
 2006-06-19 14:38:57 +02:00
lars@mysql.com
ad809c6b15 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-19 13:30:54 +02:00
lars@mysql.com
67e476f29f BUG#17201 Changed to other database (BUG#20531 hinders usage of 'test' database) 2006-06-19 13:23:13 +02:00
svoj@may.pils.ru
8d802218fb Merge april:devel/BitKeeper/mysql-5.0-engines 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
 2006-06-19 16:11:23 +05:00
svoj@may.pils.ru
6a90aede13 Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
 2006-06-19 16:06:29 +05:00
gkodinov@mysql.com
8a54caab03 Merge mysql.com:/home/kgeorge/mysql/4.1/B9676 
into  mysql.com:/home/kgeorge/mysql/5.0/B9676
 2006-06-19 13:31:11 +03:00
gkodinov@mysql.com
6777928eec Merge mysql.com:/home/kgeorge/mysql/4.1/teamclean 
into  mysql.com:/home/kgeorge/mysql/4.1/B9676
 2006-06-19 13:25:28 +03:00
gkodinov@mysql.com
c5ed7a87f4 * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big 
tables
Currently in INSERT ... SELECT ... LIMIT ... the compiler uses a 
temporary table to store the results of SELECT ... LIMIT .. and then
uses that table as a source for INSERT. The problem is that in some cases
it actually skips the LIMIT clause in doing that and materializes the 
whole SELECT result set regardless of the LIMIT.
This fix is limiting the process of filling up the temp table with only 
that much rows that will be actually used by propagating the LIMIT value.
 2006-06-19 13:22:42 +03:00
anozdrin@mysql.com
a992833d83 The second fix for BUG#19391: IM fails to start after two executions. 2006-06-19 14:16:10 +04:00
anozdrin@mysql.com
a142a4d97b Small fix for test suite: 
- fix for IM stopping routine;
  - polishing.
 2006-06-19 14:15:26 +04:00
anozdrin@mysql.com
2e56e82180 Fix of test suite in scope of fixing BUG#18023: IM: instance 
can be started several times; monitor interval must be > 2sec
 2006-06-19 14:13:34 +04:00
lars@mysql.com
5937422a53 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-19 12:09:24 +02:00
lars@mysql.com
ba3e825e21 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
 2006-06-19 12:06:54 +02:00
svoj@may.pils.ru
737e166403 Merge april:devel/BitKeeper/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1
 2006-06-19 14:13:44 +05:00
svoj@may.pils.ru
37cdb0fbf3 BUG#18036 - update of table joined to self reports table as crashed 
Certain updates of table joined to self results in unexpected
behavior.

The problem was that record cache was mistakenly enabled for
self-joined table updates. Normally record cache must be disabled
for such updates.

Fixed wrong condition in code that determines whether to use
record cache for self-joined table updates.

Only MyISAM tables were affected.
 2006-06-19 14:05:14 +05:00
ramil@mysql.com
49797c23b3 Fix for bug #20496: func_time.test failure 2006-06-19 13:03:29 +05:00
evgen@moonbone.local
92b4a73a20 Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-19 03:50:09 +04:00