mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 15:54:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
40585 commits 2774 branches 343 tags 1.6 GiB
Commit graph

40585 commits

This branch
This branch
All branches
Author SHA1 Message Date
joerg@trift2.
d2b5c88846 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-16 21:09:34 +01:00
joerg@trift2.
7ede3508c8 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-16 21:07:08 +01:00
joerg@trift2.
3a12df0bb9 Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2006-11-16 21:04:01 +01:00
joerg@trift2.
aa5b64f98b Merge trift2.:/MySQL/M50/tmp-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-16 21:01:52 +01:00
holyfoot/hf@mysql.com/deer.(none)
497ccd6b87 Merge mysql.com:/home/hf/work/mysql-4.1-mrg 
into  mysql.com:/home/hf/work/mysql-5.0-mrg
 2006-11-16 23:16:44 +04:00
holyfoot/hf@mysql.com/deer.(none)
e7cde72651 merging 2006-11-16 23:00:48 +04:00
joerg@trift2.
0fad5fed44 Merge trift2.:/MySQL/M51/bug22081-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-16 19:01:35 +01:00
holyfoot/hf@mysql.com/deer.(none)
2963d8ddd2 merging 2006-11-16 21:23:34 +04:00
pekka@orca.ndb.mysql.com
caaadb9b05 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-misc 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-misc
 2006-11-16 18:15:03 +01:00
malff/marcsql@weblab.(none)
e8d51e62bb Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-22684
 2006-11-16 10:06:36 -07:00
holyfoot/hf@mysql.com/deer.(none)
db5db841a9 Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/home/hf/work/mysql-4.1-mrg
 2006-11-16 20:44:37 +04:00
malff/marcsql@weblab.(none)
ccfbd68615 Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions) 
Before this change, the functions BENCHMARK, ENCODE, DECODE and FORMAT could
only accept a constant for some parameters.

After this change, this restriction has been removed. An implication is that
these functions can also be used in prepared statements.

The change consist of changing the following classes:
- Item_func_benchmark
- Item_func_encode
- Item_func_decode
- Item_func_format
to:
- only accept Item* in the constructor,
- and evaluate arguments during calls to val_xxx()
which fits the general design of all the other functions.

The 'TODO' items identified in item_create.cc during the work done for
Bug 21114 are addressed by this fix, as a natural consequence of aligning
the design.

In the 'func_str' test, a single very long test line involving an explain
extended select with many functions has been rewritten into multiple
separate tests, to improve maintainability.
The result of explain extended select decode(encode(...)) has changed,
since the encode and decode functions now print all their parameters.
 2006-11-16 09:03:47 -07:00
joerg@trift2.
7750d852ac Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-16 15:26:37 +01:00
joerg@trift2.
43cd9427e2 Merge trift2.:/MySQL/M50/bug22081-5.0 
into  trift2.:/MySQL/M51/bug22081-5.1
 2006-11-16 15:16:51 +01:00
joerg@trift2.
a2b1f2c187 Merge trift2.:/MySQL/M50/bug22081-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-16 14:47:05 +01:00
joerg@trift2.
818f3fa21f Merge trift2.:/MySQL/M41/bug22081-4.1 
into  trift2.:/MySQL/M50/bug22081-5.0
 2006-11-16 14:38:15 +01:00
joerg@trift2.
29dd8d2e58 support-files/mysql.spec.sh : Add an "Obsoletes" note relative to SuSE RPMs (bug#22081). 2006-11-16 14:01:31 +01:00
joerg@trift2.
77c7fcd743 Merge trift2.:/MySQL/M51/push-5.1 
into  trift2.:/MySQL/M51/bug22081-5.1
 2006-11-16 13:58:44 +01:00
jani@ua141d10.elisa.omakaista.fi
596f64d91a Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-lex-string
 2006-11-16 14:38:45 +02:00
kroki/tomash@moonlight.intranet
95fc666a03 Fix after manual merge. 2006-11-16 14:49:41 +03:00
kroki/tomash@moonlight.intranet
2b9bcb2c3c Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17047
 2006-11-16 14:19:37 +03:00
kroki/tomash@moonlight.intranet
690cb27d05 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug17047
 2006-11-16 14:15:56 +03:00
kroki/tomash@moonlight.intranet
0f94e84fd2 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17047 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug17047
 2006-11-16 14:13:03 +03:00
kroki/tomash@moonlight.intranet
9e7f682116 Add 5.0 part of fix for bug 17047. 2006-11-16 14:06:51 +03:00
kroki/tomash@moonlight.intranet
23efecdb3c Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug17047 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17047
 2006-11-16 13:25:55 +03:00
kroki/tomash@moonlight.intranet
b8d5451565 BUG#17047: CHAR() and IN() can return NULL without signaling NULL result 
The problem was that some functions (namely IN() starting with 4.1, and
CHAR() starting with 5.0) were returning NULL in certain conditions,
while they didn't set their maybe_null flag.  Because of that there could
be some problems with 'IS NULL' check, and statements that depend on the
function value domain, like CREATE TABLE t1 SELECT 1 IN (2, NULL);.

The fix is to set maybe_null correctly.
 2006-11-16 13:21:38 +03:00
mats@romeo.(none)
fd810905e9 Merge romeo.(none):/home/bkroot/mysql-5.1 
into  romeo.(none):/home/bk/memcheck-mysql-5.1
 2006-11-16 08:47:47 +01:00
brian@zim.(none)
c13bf0e466 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/unmerge-5.1
 2006-11-15 18:04:35 -08:00
brian@zim.(none)
5649195493 This finished the bzero() on varchar patch I wrote a few months ago. It also completes the data_length() method I added to Fields to determine the length of data for a particular data type. I have many uses for this :) 2006-11-15 17:55:17 -08:00
malff/marcsql@weblab.(none)
f5213debcc Made the test deterministic, so they don't depend on the SF cache. 2006-11-15 15:51:22 -07:00
joerg@trift2.
75699a0315 Merge trift2.:/MySQL/M50/spec-mtr-5.0 
into  trift2.:/MySQL/M51/spec-mtr-5.1
 2006-11-15 21:09:30 +01:00
joerg@trift2.
66142e76c5 Merge trift2.:/MySQL/M50/spec-mtr-5.0 
into  trift2.:/MySQL/M50/clone-5.0
 2006-11-15 20:39:04 +01:00
joerg@trift2.
28fe4a5501 Merge trift2.:/MySQL/M50/spec-mtr-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-15 20:36:33 +01:00
joerg@trift2.
844d5161fc Merge trift2.:/MySQL/M41/spec-mtr-4.1 
into  trift2.:/MySQL/M50/spec-mtr-5.0
 2006-11-15 20:34:44 +01:00
joerg@trift2.
65d6b24ed9 support-files/mysql.spec.sh : Use "report features" in the first test run. 2006-11-15 20:27:02 +01:00
malff/marcsql@weblab.(none)
2afbcdf46f Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-18239
 2006-11-15 11:24:57 -07:00
lars@mysql.com/black.(none)
4e9ef283ef Dummy push to force pushbuild retest 2006-11-15 19:17:52 +01:00
mats@romeo.(none)
1cff21b531 Changeset to fix a valgrind error in the main tree. 
Adding class to handle temporary allocate of memory during write of rows.
Eliminating cut'n-paste error between THD::binlog_{write,update,delete}_row().
 2006-11-15 16:49:03 +01:00
lars@black.(none)
0791f80865 Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-11-15 13:17:43 +01:00
lars@mysql.com/black.(none)
8da4385e3d Merge mysql.com:/home/bkroot/mysql-5.0 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-11-15 13:11:25 +01:00
lars@mysql.com/black.(none)
a265af4229 disabled test case that is still disabled in main 2006-11-15 13:05:13 +01:00
lars@black.(none)
866b998b06 Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-11-15 12:42:45 +01:00
lars@mysql.com/black.(none)
021d85f032 Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-11-15 12:41:51 +01:00
lars@black.(none)
3ecf6b3453 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-11-15 12:40:48 +01:00
lars@mysql.com/black.(none)
ea3915dbe5 Merge mysql.com:/home/bkroot/mysql-5.0-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-11-15 12:40:07 +01:00
lars@mysql.com/black.(none)
a6801d4fe4 Merge mysql.com:/home/bkroot/mysql-4.1-rpl 
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
 2006-11-15 12:39:21 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
3af7d5fa9d Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
 2006-11-15 13:05:37 +02:00
mskold/marty@mysql.com/linux.site
a4ae99533c bug #24301 Next command hangs in mysql after creating new NDB table via LIKE operation.: Locked mutex LOCK_open during operation 2006-11-15 12:05:05 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
10767f3f9a Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/4.1 
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
 2006-11-15 12:55:43 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
5235785b2e bug#19402 SQL close to the size of the max_allowed_packet fails on the slave 
mending windows test.
 2006-11-15 12:53:07 +02:00