mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
52579 commits 2788 branches 343 tags 1.7 GiB
Commit graph

2691 commits

Author SHA1 Message Date
jani@a88-113-38-195.elisa-laajakaista.fi
4f98f3e683 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2008-02-08 12:13:33 +01:00
serg@janus.mylan
d9ca7b670e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-12-20 22:11:37 +01:00
kostja@bodhi.(none)
bffc615e6c Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-12-15 16:59:43 +03:00
cmiller@zippy.cornsilk.net
edbacd3a99 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-12-14 13:42:09 -05:00
anozdrin/alik@station.
151444c626 Merge station.:/mnt/raid/alik/MySQL/devel/5.1 
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt
 2007-12-14 16:30:22 +03:00
tomas@whalegate.ndb.mysql.com
0bd2a86e90 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-14 06:55:44 +01:00
kostja@bodhi.(none)
7c8fe302c3 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-12-13 23:59:47 +03:00
kostja@bodhi.(none)
5b80d6a11b Fix broken embedded build (broken by the patch for Bug#12713, first part). 2007-12-13 23:58:55 +03:00
tomas@whalegate.ndb.mysql.com
a2486e0d14 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-13 21:51:03 +01:00
tomas@whalegate.ndb.mysql.com
e9466462e8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
 2007-12-13 21:32:45 +01:00
tomas@whalegate.ndb.mysql.com
4b5e9edd69 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-13 14:26:57 +01:00
gluh@eagle.(none)
4f5868114a Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-12-13 15:56:04 +04:00
tomas@whalegate.ndb.mysql.com
6bc455e353 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
 2007-12-13 12:04:00 +01:00
istruewing@stella.local
65fda831ce Merge stella.local:/home2/mydev/mysql-5.1-bug30273 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-12-11 21:38:08 +01:00
istruewing@stella.local
03d99c5956 Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-12-11 21:37:33 +01:00
tomas@whalegate.ndb.mysql.com
824d17ba77 bug#33142: access after free() for blob replication and online alter table 2007-12-11 16:04:33 +01:00
istruewing@stella.local
55aa6376f1 Bug#30273 - merge tables: Can't lock file (errno: 155) 
The patch for Bug 26379 (Combination of FLUSH TABLE and
REPAIR TABLE corrupts a MERGE table) fixed this bug too.
However it revealed a new bug that crashed the server.

Flushing a merge table at the moment when it is between open
and attach of children crashed the server.

The flushing thread wants to abort locks on the flushed table.
It calls ha_myisammrg::lock_count() and ha_myisammrg::store_lock()
on the TABLE object of the other thread.

Changed ha_myisammrg::lock_count() and ha_myisammrg::store_lock()
to accept non-attached children. ha_myisammrg::lock_count() returns
the number of MyISAM tables in the MERGE table so that the memory
allocation done by get_lock_data() is done correctly, even if the
children become attached before ha_myisammrg::store_lock() is
called. ha_myisammrg::store_lock() will not return any lock if the
children are not attached.

This is however a change in the handler interface. lock_count()
can now return a higher number than store_lock() stores locks.
This is more safe than the reverse implementation would be.
get_lock_data() in the SQL layer is adjusted accordingly. It sets
MYSQL_LOCK::lock_count based on the number of locks returned by
the handler::store_lock() calls, not based on the numbers returned
by the handler::lock_count() calls. The latter are only used for
allocation of memory now.

No test case. The test suite cannot reliably run FLUSH between
lock_count() and store_lock() of another thread. The bug report
contains a program that can repeat the problem with some
probability.
 2007-12-11 15:32:10 +01:00
tomas@whalegate.ndb.mysql.com
2477f7acb6 compile error fix for osx 2007-12-11 15:19:37 +01:00
tomas@whalegate.ndb.mysql.com
541db60153 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-10 10:32:21 +01:00
tomas@whalegate.ndb.mysql.com
9eb0ef8914 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-10 10:26:01 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
0d63a0d63f Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-12-07 22:27:48 +02:00
svoj@mysql.com/june.mysql.com
413112fb55 BUG#32817 - though CSV is marked as supported create table is rejected 
with error 1005.

CSV doesn't support nullable fields. Report descriptive error if create
table with nullable field is requested.
 2007-12-07 14:44:03 +04:00
mskold/marty@mysql.com/quadfish.(none)
af908e61b7 bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes 2007-12-07 11:05:19 +01:00
mskold/marty@quadfish.(none)
e051994b10 Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb 
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
 2007-12-07 10:46:12 +01:00
holyfoot/hf@hfmain.(none)
18e6de9f15 Merge mysql.com:/home/hf/work/32247/my51-32247 
into  mysql.com:/home/hf/work/mrg/my51-mrg
 2007-12-06 16:43:52 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
dc01dba255 Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table). 
ha_partition::update_create_info() just calls update_create_info
of a first partition, so only get the autoincrement maximum
of the first partition, so SHOW CREATE TABLE can show
small AUTO_INCREMENT parameters.
Fixed by implementing ha_partition::update_create_info() in a way
other handlers work.
HA_ARCHIVE:stats.auto_increment handling made consistent with other engines
 2007-12-06 16:39:42 +04:00
tsmith@ramayana.hindu.god
8fc0bfb6b6 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
 2007-12-05 12:33:36 -07:00
jonas@perch.ndb.mysql.com
42cfaa616a ndb - testNodeRestart -n Bug27466 T1 
make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race, error insert causes 5s delay)
 2007-12-03 14:31:17 +01:00
jonas@perch.ndb.mysql.com
6d56f4b95b Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2007-12-03 12:46:08 +01:00
jonas@perch.ndb.mysql.com
2d67819f74 ndb - bug#26457 
Fix bug in bug fix, causing random test-failure
 2007-12-03 12:43:50 +01:00
holyfoot/hf@hfmain.(none)
34de307073 Merge mysql.com:/home/hf/work/mrg/my50-mrg 
into  mysql.com:/home/hf/work/mrg/my51-mrg
 2007-12-01 00:46:44 +04:00
svoj@mysql.com/april.(none)
c7b75f18a3 Merge april.(none):/home/svoj/devel/bk/mysql-5.1-engines 
into  april.(none):/home/svoj/devel/mysql/BUG32050/mysql-5.1-engines
 2007-11-29 23:51:05 +04:00
svoj@june.mysql.com
50ace543fc Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG31833/mysql-5.1-engines
 2007-11-29 15:45:09 +04:00
tomas@whalegate.ndb.mysql.com
88da58090d Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-11-28 08:57:31 +01:00
svoj@mysql.com/april.(none)
a4d2d87395 BUG#32050 - table logging gone wrong. 
INSERT/UPDATE against CSV table created by MySQL earlier than 5.1.23
with NULL-able column results in server crash in debug builds.

Starting with 5.1.23 CSV doesn't permit creation of NULL-able columns,
but it is still possible to get such table from older MySQL versions.

Fixed by removing excessive DBUG_ASSERT().
 2007-11-27 14:01:11 +04:00
kaa@polly.(none)
559b799d0b Merge polly.(none):/home/kaa/src/opt/bug28837/my51-bug29131 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-11-26 20:15:30 +03:00
kaa@polly.(none)
bc10c6db95 Merge polly.(none):/home/kaa/src/opt/bug28837/my50-bug29131 
into  polly.(none):/home/kaa/src/opt/bug28837/my51-bug29131
 2007-11-26 20:02:04 +03:00
istruewing@stella.local
c29088d275 Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-11-26 15:38:29 +01:00
jani@hynda.mysql.fi
2e034c1e3b Merge hynda.mysql.fi:/home/my/mysql-5.1-main 
into  hynda.mysql.fi:/home/my/mysql-5.1-marvel
 2007-11-26 11:27:01 +02:00
holyfoot/hf@hfmain.(none)
4916196ed0 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/30284/my51-30284
 2007-11-24 15:02:23 +04:00
holyfoot/hf@hfmain.(none)
19d11753a8 Merge mysql.com:/home/hf/work/30284/my50-30284 
into  mysql.com:/home/hf/work/30284/my51-30284
 2007-11-24 14:57:51 +04:00
jonas@perch.ndb.mysql.com
2aefa6cf81 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2007-11-23 16:22:59 +01:00
svoj@mysql.com/june.mysql.com
876f49710e BUG#31833 - ORDER BY leads to wrong result when ARCHIVE, BLOB and 
table cache is full

After reading last record from freshly opened archive table
(e.g. after flush table, or if there is no room in table cache),
the table is reported as crashed.

The problem was that azio wrongly invalidated azio_stream when it
meets EOF.
 2007-11-23 17:51:12 +04:00
tomas@whalegate.ndb.mysql.com
49a1547246 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
 2007-11-23 13:22:16 +01:00
jonas@perch.ndb.mysql.com
b303fc3998 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2007-11-23 12:17:13 +01:00
jonas@perch.ndb.mysql.com
c0e331e60f ndb - bug#32652 
release subscriber
 2007-11-23 12:13:10 +01:00
tomas@whalegate.ndb.mysql.com
31f6b1d018 bug#28445 - Heartbeat does not start until first API_REGREQ is recevied 
- move api failure handling into own method
- add START_ORD so that hb checking can start really early
 2007-11-23 10:46:48 +01:00
tomas@whalegate.ndb.mysql.com
5258da2a57 Bug#29621 - ndb_mgmd can timeout logevent request, making it to fail 2007-11-23 10:25:19 +01:00
tomas@whalegate.ndb.mysql.com
2b489b898b Bug #29139 missing error message for 275 2007-11-22 14:59:16 +01:00
istruewing@stella.local
3be5815015 Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-11-21 20:32:58 +01:00