mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45481 commits 2785 branches 343 tags 1.6 GiB
Commit graph

45481 commits

This branch
This branch
All branches
Author SHA1 Message Date
mats@romeo.(none)
f844e2bcd3 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  romeo.(none):/home/bkroot/mysql-5.1-rpl
 2007-04-13 09:12:01 +02:00
mats@romeo.(none)
490bed495e Merge romeo.(none):/home/bkroot/mysql-5.1-rpl 
into  romeo.(none):/home/bk/b27779-mysql-5.1-rpl
 2007-04-13 08:55:03 +02:00
tomas@whalegate.ndb.mysql.com
2a917850d2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
 2007-04-13 08:15:49 +02:00
tomas@whalegate.ndb.mysql.com
51d5c403fa Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
 2007-04-13 08:15:07 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
104824a90f Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-4.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel
 2007-04-13 09:14:47 +03:00
tomas@whalegate.ndb.mysql.com
e315f9f765 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
 2007-04-13 08:14:05 +02:00
tomas@whalegate.ndb.mysql.com
1d1fbaae8d Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
 2007-04-13 08:13:16 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
8ad4614bcd Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.1-marvel
 2007-04-13 09:07:46 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
c66f50fa68 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel
 2007-04-13 09:04:34 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
68d795b0da Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-4.1-main
 2007-04-13 09:02:14 +03:00
bar@bar.myoffice.izhnet.ru
37b467a43c Merge mysql.com:/home/bar/mysql-5.0.b20095 
into  mysql.com:/home/bar/mysql-5.1-new-rpl
 2007-04-13 10:08:52 +05:00
bar@mysql.com
52f4b9343f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.0.b20095
 2007-04-13 10:06:50 +05:00
bar@mysql.com
be8fc46db6 Bug#20095 Changing length of VARCHAR field with UTF8 collation does not truncate values 
Problem: single byte do_varstring1() function was called, which didn't
check limit on "number of character", and checked only "number of bytes".
Fix: adding a multi-byte aware function do_varstring1_mb(),
to limit on "number of characters"
 2007-04-13 10:05:55 +05:00
tomas@whalegate.ndb.mysql.com
592e0f2250 correct merge error 2007-04-13 01:52:45 +02:00
tomas@whalegate.ndb.mysql.com
ac8d2dead6 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-13 01:45:44 +02:00
tomas@whalegate.ndb.mysql.com
5d89ca3a89 Bug#27775 mediumint auto_increment with ndb_restore 
- autoincrement column of size medium int not handled in ndb_restore
- added testcase also for other types, tiny, small... etc
 2007-04-13 01:37:24 +02:00
monty@mysql.com/narttu.mysql.fi
6e8b72a6bb Added more descriptive error message of why statement was automaticly dropped 
Print information if net_clear() skipped bytes (As this otherwise hides critical timeing bugs)
Added DBUG_ASSERT if we get packets out of order
mysql_change_user() could on error send multiple packets, which caused mysql_client_test to randomly fail
 2007-04-13 01:56:22 +03:00
tomas@whalegate.ndb.mysql.com
e55b963da8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
 2007-04-12 21:39:06 +02:00
gshchepa/uchum@gshchepa.localdomain
342a6c5866 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gshchepa.localdomain:/home/uchum/work/bk-trees/5507-ci
 2007-04-13 00:38:45 +05:00
tomas@whalegate.ndb.mysql.com
7fd59a08af Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
 2007-04-12 21:38:44 +02:00
tomas@whalegate.ndb.mysql.com
ce23702510 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-12 21:35:39 +02:00
tomas@whalegate.ndb.mysql.com
3ff7444ac7 remove inline NdbRecAttr functions for medium int as not to depend in my_global 2007-04-12 21:34:25 +02:00
gshchepa/uchum@gshchepa.localdomain
4b2aab14ba Bug#5507: TRUNCATE does not work with views. 
Support of views wasn't implemented for the TRUNCATE statement.
Now TRUNCATE on views has the same semantics as DELETE FROM view:
mysql_truncate() checks whether the table is a view and falls back
to delete if so.
In order to initialize properly the LEX::updatable for a view
st_lex::can_use_merged() now allows usage of merged views for the
TRUNCATE statement.
 2007-04-12 23:21:37 +05:00
tomas@whalegate.ndb.mysql.com
3b15858f82 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
 2007-04-12 19:50:28 +02:00
tomas@whalegate.ndb.mysql.com
0ddf40b025 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
 2007-04-12 19:49:46 +02:00
tomas@whalegate.ndb.mysql.com
8a98276ba7 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt
 2007-04-12 19:49:21 +02:00
joerg@trift2.
3f72507d0d Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-04-12 19:09:29 +02:00
joerg@trift2.
3050edc0b9 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-04-12 18:41:55 +02:00
tomas@whalegate.ndb.mysql.com
ba60730808 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
 2007-04-12 18:29:43 +02:00
tomas@whalegate.ndb.mysql.com
6015317269 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
 2007-04-12 18:29:24 +02:00
tomas@whalegate.ndb.mysql.com
059b899381 remove warning 2007-04-12 16:33:39 +02:00
tomas@whalegate.ndb.mysql.com
6dd82bd3a4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-04-12 16:14:20 +02:00
tomas@whalegate.ndb.mysql.com
036f4e4059 Bug#17095 circular replication for ndb 
- test case
- reset server id in injector
 2007-04-12 16:13:49 +02:00
jonas@perch.ndb.mysql.com
bdd0e4543e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-04-12 16:01:45 +02:00
jonas@perch.ndb.mysql.com
6b67f57249 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-04-12 16:00:51 +02:00
jonas@perch.ndb.mysql.com
f06225a6e1 ndb - bug#27756 
make sure that copy tuple is released in all cases
 2007-04-12 15:55:39 +02:00
mats@romeo.(none)
06faf8f411 BUG#27779 (Slave cannot read old rows log events): 
Taking code from before BUG#22583 and incorporating as events to be able
to read old events. Also incorporating old pack and unpack functions
into patch.
 2007-04-12 15:50:54 +02:00
mats@romeo.(none)
c2f20fa79e Merge romeo.(none):/home/bkroot/mysql-5.0-rpl 
into  romeo.(none):/home/bk/b26551-mysql-5.0-rpl
 2007-04-12 14:32:37 +02:00
mats@romeo.(none)
785bca21e0 BUG#25688 (RBR: circular replication may cause STMT_END_F flags to 
be skipped):

Fixing test since a replace assumed that we were on slave when we were
on master.
 2007-04-12 14:14:50 +02:00
mats@romeo.(none)
fd24cdf91c BUG#26551 (Aborted query for non-transactional table breaks replication): 
Added error code ER_QUERY_INTERRUPTED to the list of special errors
that prevent the slave from starting to execute a query.
 2007-04-12 14:00:45 +02:00
mats@capulet.net
fea4fb0696 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  capulet.net:/home/bk/mysql-5.1-rpl
 2007-04-12 13:22:11 +02:00
mats@capulet.net
f3c7006a05 Adding build file for Solaris on AMD64 2007-04-12 13:20:38 +02:00
jani@ua141d10.elisa.omakaista.fi
335153121b Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-04-12 12:50:02 +03:00
jonas@perch.ndb.mysql.com
967eb52b68 ndb - bug#27756 
testcase only
  new pseudo column NDB$COPY_ROWID
 2007-04-12 11:47:38 +02:00
jonas@perch.ndb.mysql.com
3411ba8ba6 ndb - hugo - add new method for setting primary key(s) 2007-04-12 11:43:56 +02:00
tomas@whalegate.ndb.mysql.com
98c2e79af4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-12 11:29:05 +02:00
tomas@whalegate.ndb.mysql.com
2e620e3db6 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-12 11:12:43 +02:00
tomas@whalegate.ndb.mysql.com
f9a900f80e Bug #27758 Restoring NDB backups makes table usable in SQL nodes 
- parse indexname using "split" instead of sscanf, as not to break at space
- test case with space in key
- enclose names in printout
 2007-04-12 11:07:30 +02:00
mats@romeo.(none)
fcd6ea611b BUG#25688 (RBR: circular replication may cause STMT_END_F flags to be 
skipped):

Post-merge changes.
 2007-04-12 10:05:55 +02:00
mats@romeo.(none)
93860556e6 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b25688-mysql-5.1-rpl
 2007-04-12 09:10:45 +02:00