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

45501 commits

This branch
This branch
All branches
Author SHA1 Message Date
holyfoot/hf@hfmain.(none)
13a7fdac24 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-14 14:56:07 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
db7e62e7fb Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-04-14 14:55:33 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
8b49f27530 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-04-14 14:54:59 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
cf18d38c83 Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
 2007-04-14 14:54:28 +05:00
epotemkin@bk-internal.mysql.com
9e2dcb5e91 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-04-13 23:32:23 +02:00
mats@capulet.net
d45e738b71 Fixes to make it compile when using Sun CC and restoring some changes 
done in previous patches.

There is an error in the Sun CC compiler that treats parameters that
differ in only qualifier as different, even though this is not
allowed by the standard (ISO/IEC 14882:2003, Section 13.1).
 2007-04-13 19:19:10 +02:00
mats@capulet.net
ffa4fdb055 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  capulet.net:/home/bk/mysql-5.1-rpl
 2007-04-13 18:19:38 +02:00
mats@romeo.(none)
5bc84999f7 Yet another time_t fix. 2007-04-13 15:40:22 +02:00
mats@capulet.net
d3f5c1fdc9 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  capulet.net:/home/bk/mysql-5.1-rpl
 2007-04-13 15:17:36 +02:00
mats@romeo.(none)
06ee2fd79e Merge romeo.(none):/home/bkroot/mysql-5.1-rpl 
into  romeo.(none):/home/bk/b27779-mysql-5.1-rpl
 2007-04-13 14:59:49 +02:00
mats@romeo.(none)
b27e486a07 Fixing portability problem by using my_time_t instead of time_t. 2007-04-13 14:56:24 +02:00
mats@romeo.(none)
84ec7be2c7 WL#2735: Refactor replication 
Factoring out pack_row() and unpack_row() into new files
rpl_record.{cc,h}.
 2007-04-13 14:55:28 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
455b325b53 Avoid resetting a variable. Fixed grant.test. 2007-04-13 14:04:57 +03:00
mats@romeo.(none)
6044deb72e BUG#17095 (Cluster RBR in circle does not terminate): 
Updating result files with wrong server id for BEGIN and COMMIT
events.
 2007-04-13 12:03:01 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
defddfd255 Merged from 5.0 2007-04-13 12:47:44 +03:00
mats@capulet.net
33a7de8276 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  capulet.net:/home/bk/mysql-5.1-rpl
 2007-04-13 11:22:53 +02:00
mats@romeo.(none)
7f279ae5e9 Fixing compile problem on some platforms resulting from building a 
configuration with HAVE_REPLICATION undefined, which causes the
*_rows_log_event_old classes to only have a default constructor. This
generates an error on some platforms, since the base classes does 
not have a default constructor defined.

Updating signatures of do_prepare_row() for classes above, since
signatures in base classes changed.
 2007-04-13 11:19:31 +02:00
mats@romeo.(none)
df53e89fca Fixing portability issues regarding use of time_t. 2007-04-13 10:40:22 +02:00
mats@romeo.(none)
75c1242de8 Fixing result file 2007-04-13 10:38:34 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
52196018ce Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.1-marvel
 2007-04-13 10:25:33 +03:00
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