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

35752 commits

This branch
This branch
All branches
Author SHA1 Message Date
mskold@mysql.com
bd3f9cc0a5 Merge mysql.com:/home/marty/MySQL/mysql-5.0-backed 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-06-21 09:42:15 +02:00
mskold@mysql.com
e77850e573 Fix for Bug #19906 REPLACE doesn't update TEXT fields correctly 2006-06-21 09:36:50 +02:00
jonas@perch.ndb.mysql.com
fe6330fd25 Merge perch.ndb.mysql.com:/home/jonas/src/50-jonas 
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
 2006-06-21 09:27:47 +02:00
jonas@perch.ndb.mysql.com
8f74fa6c48 Merge perch.ndb.mysql.com:/home/jonas/src/41-jonas 
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
 2006-06-21 09:22:16 +02:00
jonas@perch.ndb.mysql.com
99621b01eb ndb autotest - 
add BUILD/compile-ndb-autotest to simplify building autotest on different mysql versions
 2006-06-21 09:20:55 +02:00
andrey@lmy004.
cf16c8ec3c add event_timed.h also to the distribution 2006-06-21 08:58:56 +02:00
tomas@poseidon.ndb.mysql.com
ca69967dd4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-21 08:52:31 +02:00
tomas@poseidon.ndb.mysql.com
f072f7cbb5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-21 08:49:40 +02:00
igor@rurik.mysql.com
5e8d011c3a Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-4.1-opt
 2006-06-20 22:15:30 -07:00
ramil@mysql.com
81277475f8 Merge mysql.com:/usr/home/ram/work/mysql-4.1 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-06-21 09:16:22 +05:00
igor@rurik.mysql.com
2893d11c5e Fixed bug #16674. 
The length of the prefix of the pattern string in the LIKE predicate that 
determined the index range to be scanned was calculated incorrectly for
multi-byte character sets. 
As a result of this in 4. 1 the the scanned range was wider then necessary
if the prefix contained not only one-byte characters.  
In 5.0 additionally it caused missing some rows from the result set.
 2006-06-20 19:57:21 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
6f6f9b90fb Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0
 2006-06-21 02:37:25 +03:00
jani@ua141d10.elisa.omakaista.fi
c22e7f2dfd Fix for Bug#18246 "compilation error with tcp_wrapper" 2006-06-21 02:23:18 +03:00
evgen@moonbone.local
d924f70cc7 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-21 02:21:11 +04:00
sergefp@mysql.com
827fe15621 Remove deadcode in select_dumpvar::send_data() 2006-06-21 02:21:10 +04:00
anozdrin@mysql.com
bb94cb24c5 Re-enable IM tests. 2006-06-21 02:17:39 +04:00
anozdrin@mysql.com
ddaebd13dc Fix merge 5.0 -> 5.1. 2006-06-21 02:16:38 +04:00
anozdrin@booka.site
3a6ad23f43 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/alik/MySQL/devel/5.1-merged
 2006-06-21 02:00:49 +04:00
dlenev@mysql.com
b75254e101 Fix for bug#19634 "Re-execution of multi-delete which involve trigger/stored 
function crashes server".

Attempts to execute prepared multi-delete statement which involved trigger or
stored function caused server crashes (the same happened for such statements
included in stored procedures in cases when one tried to execute them more
than once).

The problem was caused by yet another incorrect usage of check_table_access()
routine (the latter assumes that table list which it gets as argument
corresponds to value LEX::query_tables_own_last). We solve this problem by
juggling with LEX::query_tables_own_last value when we call
check_table_access() for LEX::auxilliary_table_list (better solution is too
intrusive and should be done in 5.1).
 2006-06-21 01:50:20 +04:00
cmiller@zippy.(none)
deca07bdcc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
 2006-06-20 17:17:04 -04:00
evgen@moonbone.local
8c0aa3560c field.cc, field.h: 
Additional fix for #16377 for bigendian platforms
sql_select.cc, select.result, select.test:
  After merge fix
 2006-06-21 01:14:53 +04:00
evgen@moonbone.local
278b26a39b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-21 01:10:59 +04:00
mikael@dator5.(none)
cd93441a0a Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug17138
 2006-06-20 16:59:51 -04:00
mikael@dator5.(none)
02e46e8204 BUG#17138: Crash in stored procedure after fatal error that wasn't a real fatal error 2006-06-20 16:52:40 -04:00
evgen@moonbone.local
6b694bcd58 rpl_ndb_log.result: 
Corrected test case result
 2006-06-21 00:45:01 +04:00
mikael@dator5.(none)
da260e9e3f Merge dator5.(none):/home/pappa/bug16000 
into  dator5.(none):/home/pappa/bug19281
 2006-06-20 16:43:25 -04:00
joerg@mysql.com
27df8b07b7 Fix for bug#18516 (also #19353, reported for 5.1): 
In addition to include "mysql_upgrade" in a RPM, it should also be called
when the RPM is upgraded.
 2006-06-20 22:40:46 +02:00
mikael@dator5.(none)
a3d5c3bf6d BUG#16000: .par file left behind plus unnecessary messages to error.log 
New test cases
 2006-06-20 16:38:42 -04:00
mikael@dator5.(none)
3505cdb0e5 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug16000
 2006-06-20 16:07:55 -04:00
evgen@moonbone.local
52d86dff85 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-06-20 23:49:33 +04:00
evgen@moonbone.local
bb53b6eeaa Manually merged 2006-06-20 23:22:51 +04:00
mikael@dator5.(none)
4f599159c7 Merge dator5.(none):/home/pappa/bug19309 
into  dator5.(none):/home/pappa/bug19281
 2006-06-20 15:18:16 -04:00
mikael@dator5.(none)
39b9c16e1a Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug19309
 2006-06-20 15:13:44 -04:00
mikael@dator5.(none)
4dd8f90912 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug19281
 2006-06-20 15:09:48 -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
0865a5da9b Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-20 19:33:25 +02: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
mikael@dator5.(none)
32c25c8e2f BUG#16000: .par file not removed plus errors to error log for normal errors 2006-06-20 13:24:30 -04:00
tomas@poseidon.ndb.mysql.com
7be42667f0 Bug #17297 Fix error messages 2006-06-20 19:17:07 +02:00
tomas@poseidon.ndb.mysql.com
f5f9f471d1 Bug #17297 Fix error messages 2006-06-20 19:13:46 +02:00
evgen@moonbone.local
66371d22e2 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
 2006-06-20 20:13:37 +04:00
evgen@moonbone.local
75164ffc2f rpl_ndb_log.result: 
Fixed failing test case
 2006-06-20 20:11:08 +04:00
rburnett@bk-internal.mysql.com
154961b26a Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-06-20 18:06:22 +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
andrey@lmy004.
45598df7d4 manual merge 2006-06-20 17:14:36 +02:00