mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 17:33:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
47608 commits 2783 branches 343 tags 1.7 GiB
Commit graph

18384 commits

Author SHA1 Message Date
ramil/ram@ramil.myoffice.izhnet.ru
03d657f60e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b28772/b28772.5.1
 2007-06-21 13:26:17 +05:00
dkatz@damien-katzs-computer.local
a197a9aa8a Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-06-19 18:18:59 -04:00
dkatz@damien-katzs-computer.local
bd80d7e465 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/50_win
 2007-06-19 18:03:47 -04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9c0b9f2266 Fix for bug #28772: rpl_row_until fails in pushbuild 
Problem: we use 'sleep 2; wait_for_slave_to_stop;' to reach some slave's states
which is buggy, wasteful of time, platform dependant etc.
Fix: use include/wait_for_slave_***.inc's where it's possible instead.
 2007-06-19 16:06:11 +05:00
msvensson@pilot.(none)
b8eee54d0b Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-19 11:34:54 +02:00
msvensson@pilot.(none)
95cf973862 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-19 11:31:34 +02:00
msvensson@pilot.(none)
f52b9d6150 Merge pilot.(none):/data/msvensson/mysql/wl3232/my50-wl3232 
into  pilot.(none):/data/msvensson/mysql/wl3232/my51-wl3232
 2007-06-19 11:08:29 +02:00
msvensson@pilot.(none)
6c22726ebd Merge pilot.(none):/data/msvensson/mysql/wl3232/my41-wl3232 
into  pilot.(none):/data/msvensson/mysql/wl3232/my50-wl3232
 2007-06-19 11:07:39 +02:00
msvensson@pilot.(none)
caebb719b2 WL#3232 mysqltest, enable --source $variables/<remaining_path_to_file> 
- Add test case for this already existing feature
 2007-06-19 11:06:02 +02:00
dkatz@damien-katzs-computer.local
f9de8dc217 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-06-18 20:01:04 -04:00
dkatz@damien-katzs-computer.local
b7a2b41374 Bug #28921 Queries containing UDF functions are cached 
Fixed runtime to no longer allow the caching of queries with UDF calls.
 2007-06-18 17:55:12 -04:00
dkatz@damien-katzs-computer.local
b89e4f9ef2 Bug #29053 SQL_CACHE in UNION causes non-deterministic functions to be cached 
Changed code to enforce that SQL_CACHE only in the first SELECT is used to turn on caching(as documented), but any SQL_NO_CACHE will turn off caching (not documented, but a useful behaviour, especially for machine generated queries). Added test cases to explicitly test the documented caching behaviour and test cases for the reported bug.
 2007-06-18 17:16:20 -04:00
tsmith@maint1.mysql.com
3f52ef0ee2 Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-18 22:13:23 +02:00
tsmith@maint1.mysql.com
c658464813 Merge maint1.mysql.com:/data/localhome/tsmith/bk/50 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
 2007-06-18 22:11:49 +02:00
tomas@whalegate.ndb.mysql.com
4547957450 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 22:06:34 +02:00
tomas@whalegate.ndb.mysql.com
8a08ac40fb correct test and result 2007-06-17 22:04:01 +02:00
tomas@whalegate.ndb.mysql.com
8eb940de27 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 19:52:01 +02:00
tomas@whalegate.ndb.mysql.com
b5f30a99f9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-06-17 19:50:07 +02:00
tomas@whalegate.ndb.mysql.com
9c5183ace9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 19:28:01 +02:00
tomas@whalegate.ndb.mysql.com
9e3c14fae3 BUG#27640 
- correct test and result file
 2007-06-17 19:27:20 +02:00
tomas@whalegate.ndb.mysql.com
830be6deac Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 17:21:27 +02:00
tomas@whalegate.ndb.mysql.com
95ed412809 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 16:26:35 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
e63f983970 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28144/b28144.5.0
 2007-06-17 10:10:36 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
6ab97748fe Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b28144/b28144.5.1
 2007-06-17 10:09:11 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
3d48942f9d after-merge fix. 2007-06-17 10:07:58 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f47b82906d Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock 
The log tables are by nature PERFORMANCE_SCHEMA tables,
which should not be affected by SET GLOBAL READ_ONLY or FLUSH TABLES
WITH READ LOCK.

The implementation of FLUSH TABLES WITH READ LOCK already ignored log tables.
Now with this patch, the implementation of LOCK TABLE also ignore a
global read lock for log tables, which was the missing symmetry.
 2007-06-17 09:56:33 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
d437d2d720 Merge mysql.com:/home/ram/work/b28144/b28144.5.0 
into  mysql.com:/home/ram/work/b28144/b28144.5.1
 2007-06-17 09:40:25 +05:00
istruewing@chilla.local
938fc3d66e Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-16 13:14:23 +02:00
istruewing@chilla.local
70600c15d8 Merge chilla.local:/home/mydev/mysql-5.0-amain 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-16 11:34:21 +02:00
tsmith@quadxeon.mysql.com
891116551e binlog.result, binlog.test: 
Post-merge fix: replace xid=* with XID to isolate from number of transactions
 2007-06-15 23:57:53 +02:00
istruewing@chilla.local
875cac1ffb Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-15 20:23:20 +02:00
tsmith@maint1.mysql.com
a9ae34b56c Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-15 18:56:11 +02:00
tsmith@maint1.mysql.com
9f4134267a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-15 18:03:59 +02:00
tsmith@quadxeon.mysql.com
73035c274f Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
 2007-06-15 17:59:04 +02:00
istruewing@chilla.local
676ea58252 Merge chilla.local:/home/mydev/mysql-5.0-amain 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-15 17:47:02 +02:00
istruewing@chilla.local
dceae35549 Merge chilla.local:/home/mydev/mysql-5.0-ateam 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-15 17:45:50 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9c9464d566 Fix for bug #28144: "Slave_IO_Running" differs in replication tests 
Problem: show slave status may return different Slave_IO_Running values running some tests.
Fix: wait for a certain slave state if needed to get tests more predictable.
 2007-06-15 16:09:28 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
44c3524026 Backport of 
mysql-test/include/wait_for_slave_io_to_stop.inc
mysql-test/include/wait_for_slave_sql_to_stop.inc
mysql-test/include/wait_for_slave_to_start.inc
mysql-test/include/wait_for_slave_to_stop.inc
from 5.1
 2007-06-15 13:53:36 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
f28a584287 Additional fix for bug N26402: 
An attempt to open file with name '????????.frm'
can produce different errors:
- ER_NO_SUCH_TABLE on Unix
- ER_FILE_NOT_FOUND on Windows
because QUESTION MARK has special meaning on Windows.
Make sure that any of these two errors happens.
 2007-06-15 11:53:46 +05:00
bar@bar.myoffice.izhnet.ru
615297df8b Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28862 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28862
 2007-06-15 11:27:10 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
caf85332ba Bug#28862 Extended Latin1 characters get lost in CVS engine 
Problem: Temporary buffer which is used for quoting and escaping
  was initialized to character set utf8, and thus didn't allow
  to store data in other character sets.
  Fix: changing character set of the buffer to be able to
  store any arbitrary sequence of bytes.
 2007-06-15 11:19:35 +05:00
dkatz@damien-katzs-computer.local
3a1a561322 Merge damien-katzs-computer.local:/Users/dkatz/mysql51 
into  damien-katzs-computer.local:/Users/dkatz/51_win
 2007-06-14 20:48:11 -04:00
tsmith@maint1.mysql.com
664fa012c0 Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/51 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-15 02:36:37 +02:00
tsmith@quadxeon.mysql.com
918090030b Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51
 2007-06-15 01:57:33 +02:00
antony@ppcg5.local
21c233440d Merge ppcg5.local:/Users/antony/Work/p2-bug25800.6 
into  ppcg5.local:/Users/antony/Work/p2-bug25800.6.merge
 2007-06-14 16:04:52 -07:00
tsmith@quadxeon.mysql.com
87fdad4ce8 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
 2007-06-14 23:23:30 +02:00
mskold/marty@linux.site
dea70c74dd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-06-14 21:58:45 +02:00
mskold/marty@linux.site
7b99f8a0fc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-06-14 19:08:46 +02:00
tomas@whalegate.ndb.mysql.com
0da2eb5ce3 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-14 18:43:29 +02:00
tomas@whalegate.ndb.mysql.com
ad81e83c70 Bug #27640 backup id not displayed in the output of "ndb_mgm start backup wait completed" 
- correction, missing node id
 2007-06-14 18:40:32 +02:00