mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
44607 commits 2784 branches 343 tags 1.6 GiB
Commit graph

44607 commits

This branch
This branch
All branches
Author SHA1 Message Date
cbell/Chuck@mysql_cab_desk.
9fb3199c26 WL#3629 - Replication of Invocation and Invoked Features 
This patch corrects an error in the header file concerning a method declaration
in the header file. Compiles ok on Windows, but not on Linux.
 2007-03-29 13:21:59 -04:00
cbell/Chuck@mysql_cab_desk.
0322284f92 WL#3629 - Replication of Invocation and Invoked Features 
This patch corrects errors that occurred in a local manual merge.
It adds the originator column in the results of the SHOW EVENTS command
for a series of tests.

The only code change is to correct references to the classname in
enums.
 2007-03-29 11:11:28 -04:00
cbell/Chuck@mysql_cab_desk.
a591514a67 Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
 2007-03-29 09:54:59 -04:00
cbell/Chuck@mysql_cab_desk.
0627a31d7d Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629
 2007-03-29 08:38:06 -04:00
lars/lthalmann@mysql.com/dl145k.mysql.com
f02726e72a post-merge test fixes 2007-03-29 14:21:44 +02:00
cbell/Chuck@mysql_cab_desk.
89838e1008 WL#3629 - Replication of Invocation and Invoked Features 
This patch corrects errors that occurred in a local manual merge as a result
of updating the local repository and includes changes necessary to correct 
problems found during the recalculation of next execution of events in RBR.
 2007-03-29 08:17:19 -04:00
lars/lthalmann@dl145j.mysql.com
812a54ce88 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-03-29 13:52:12 +02:00
lars/lthalmann@dl145j.mysql.com
771e05d657 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-03-29 13:49:10 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
75668471d1 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-03-29 12:25:28 +02:00
bar@bar.myoffice.izhnet.ru
306af7f4bc Merge mysql.com:/home/bar/mysql-5.0.b27079 
into  mysql.com:/home/bar/mysql-5.1-new-rpl
 2007-03-29 10:36:28 +05:00
bar@mysql.com
d5c6680443 Code layout fix for bug N 27079 
Thanks to Gluh for suggestion.
 2007-03-29 10:32:38 +05:00
bar@mysql.com
6d290278cc Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.0.b27079
 2007-03-29 10:19:45 +05:00
bar@mysql.com
3099b103ce Merge mysql.com:/home/bar/mysql-5.0.b22378 
into  mysql.com:/home/bar/mysql-5.1-new-rpl
 2007-03-29 10:03:59 +05:00
bar@mysql.com
98a4bb356a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.0.b22378
 2007-03-29 10:00:01 +05:00
baker@bk-internal.mysql.com
1b9c4358a8 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-03-28 22:31:10 +02:00
mats@romeo.(none)
fc44f5c8ed Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  romeo.(none):/home/bkroot/mysql-5.1-rpl
 2007-03-28 15:40:45 +02:00
mats@romeo.(none)
0488fd87c8 Eliminating some warnings. 2007-03-28 15:30:03 +02:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
3014488a1f Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bugBug27015-s_query_q_append
 2007-03-28 14:59:00 +03:00
bar@bar.myoffice.izhnet.ru
f418475eec Merge mysql.com:/home/bar/mysql-5.0.b25946 
into  mysql.com:/home/bar/mysql-5.1.b25946
 2007-03-28 15:12:25 +05:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
cc40358768 Bug#27015 s_query.q_append() called without s_query.reserve()? 
there is a way to miss allocation for the punctuation marks,
namely if (q == EOF) is true inside of append_identifier(), i.e in case names are not quoted
(not by default).

Replacing q_append with the method with reallocation if needed.
 2007-03-28 12:18:06 +03:00
baker@bk-internal.mysql.com
2bfa1aa3d6 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-03-27 18:44:02 +02:00
tomas@whalegate.ndb.mysql.com
c86293e41e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-27 18:12:33 +02:00
mats@romeo.(none)
7054aaaafa Eliminating a warning for unused variable in non-debug build. 2007-03-27 18:04:02 +02:00
mats@romeo.(none)
d0ce263f56 Eliminating some compiler warnings. 2007-03-27 17:45:23 +02:00
mats@romeo.(none)
c9a7855f7f BUG#22583 (RBR between MyISAM and non-MyISAM tables containing a BIT 
field does not work):

Enabling previously disabled test.
 2007-03-27 17:21:47 +02:00
mats@romeo.(none)
06b5e9bb53 BUG#27441 (There is no COLS bitmap for the after image of an update 
rows event):

Adding a after image COLS bitmap to Update_rows_log_event (for telling
what columns that are present in the after image of each row update).

Also fixing case where Rows_log_event length was not correctly computed
(happened when the number of columns in a table was more than 251).
 2007-03-27 12:17:51 +02:00
bar@mysql.com
daa7e9c386 Bug#22378 Make error, strings/ctype-utf8.c, uni_plane undeclared 
- Fixing utf8_general_cs according to recent changes.
- Compiling utf8_general_cs in pentium-debug-max configuration
  to avoid these problems in the future.
 2007-03-27 15:06:41 +05:00
joerg@trift-lap.fambruehe
336f03d151 Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-03-27 12:06:13 +02:00
bar@mysql.com
5e52cd3650 Bug#25946 Namespace not include for xsi usage within --xml output with null/nil values 
Fix: adding namespace reference into "mysql --xml" output,
to make it work similary to "mysqldump --xml".
 2007-03-27 13:30:43 +05:00
bar@mysql.com
1b426d3c6d Bug#27079 Crash while grouping empty ucs2 strings 
Problem: GROUP BY on empty ucs2 strings crashed server.
Reason: sometimes mi_unique_hash() is executed with
ptr=null and length=0, which means "empty string".
The branch of code handling UCS2 character set
was not safe against ptr=null and fell into and
endless loop even if length=0 because of poiter
arithmetic overflow.
Fix: adding special check for length=0 to avoid pointer arithmetic
overflow.
 2007-03-27 12:20:20 +05:00
brian@zim.(none)
e661d6eeb6 Making sure thar archive is inited for info AUTO call. 2007-03-26 22:50:08 -07:00
brian@zim.(none)
9e1565e37e Merge piggy:/home/brian/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/pread-archive-5.1
 2007-03-26 17:31:52 -07:00
brian@zim.(none)
88719428f5 Centralized init logic for starting a scan. 2007-03-26 17:15:31 -07:00
brian@piggy.tangent.org
414da94c04 Adjusting locks for concurrency issue (not found, but suspect). 2007-03-26 16:45:17 -07:00
tomas@whalegate.ndb.mysql.com
99238e5593 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-26 21:14:28 +02:00
tomas@whalegate.ndb.mysql.com
1bae3e5726 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-26 21:13:46 +02:00
tomas@whalegate.ndb.mysql.com
71ec671d4d correction of manual merge 2007-03-26 21:10:34 +02:00
tomas@whalegate.ndb.mysql.com
2923b52e38 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-26 21:02:14 +02:00
tomas@whalegate.ndb.mysql.com
d4982247cf Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-26 20:57:10 +02:00
tomas@whalegate.ndb.mysql.com
c445baeabd correct medium int printout 
correct cit printout
    correct bit store retrieve
 2007-03-26 17:57:00 +02:00
cbell/Chuck@mysql_cab_desk.
71c4bd1f0a Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629
 2007-03-26 09:57:16 -04:00
tomas@whalegate.ndb.mysql.com
22c5d8ba44 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-26 14:49:24 +02:00
tomas@whalegate.ndb.mysql.com
405fb2cfb6 Bug #26986 BIT(33) for ndb is broken on solaris. 
- always store lsw first in ndb
 2007-03-26 14:48:52 +02:00
pekka@clam.ndb.mysql.com/clam.(none)
6ec8bb230a Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb 
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028
 2007-03-26 12:50:40 +02:00
brian@zim.(none)
68cdfea52a Merge zim.(none):/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/slap-5.1
 2007-03-26 02:29:09 -07:00
brian@zim.(none)
9a2a7071be Added pre and post option to test run (allows me to adjust an engine once all of the data has been loaded). 
Kinda obvious that this was going to come up ;)
 2007-03-26 02:24:49 -07:00
tomas@whalegate.ndb.mysql.com
7386c736c2 remove warning 2007-03-26 10:39:11 +02:00
tomas@whalegate.ndb.mysql.com
3d076ca0e5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-26 10:11:57 +02:00
tomas@whalegate.ndb.mysql.com
128b118bf0 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-26 10:11:15 +02:00
tomas@whalegate.ndb.mysql.com
690b16be05 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-26 10:01:43 +02:00