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

33628 commits

This branch
This branch
All branches
Author SHA1 Message Date
kroki/tomash@moonlight.intranet
21daae583d Cleanup: remove const. 2006-11-22 16:47:12 +03:00
kroki/tomash@moonlight.intranet
b290ed7a97 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21635
 2006-11-22 14:17:24 +03:00
kroki/tomash@moonlight.intranet
608789eb26 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21635
 2006-11-22 14:15:23 +03:00
kroki/tomash@moonlight.intranet
003cd7b78f Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21635 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21635
 2006-11-22 14:05:26 +03:00
kroki/tomash@moonlight.intranet
ec7a6d15fc BUG#21635: MYSQL_FIELD struct's member strings seem to misbehave for 
expression cols.

The problem was that MYSQL_FIELD::org_name was set for MIN() and MAX()
functions (COUNT() is also mentioned in the bug report but was already
fixed).

After this patch for expressions MYSQL_FIELD::name is set to either
expression itself or its alias, and other data origin fields of
MYSQL_FILED (db, org_table, table, org_name) are empty strings.
 2006-11-22 13:58:00 +03:00
sergefp@mysql.com
0421d489fb Fix typo in comment 2006-11-21 21:52:39 +03:00
kroki/tomash@moonlight.intranet
7cde1656e4 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23159
 2006-11-21 17:37:57 +03:00
kroki/tomash@moonlight.intranet
0a36a6f382 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23159
 2006-11-21 17:37:25 +03:00
kroki/tomash@moonlight.intranet
cb69318963 Fix after manual merge. 2006-11-21 16:57:23 +03:00
kroki/tomash@moonlight.intranet
2bde57836c Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23159 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23159
 2006-11-21 16:53:33 +03:00
kroki/tomash@moonlight.intranet
0d588f8882 BUG#23159: prepared_stmt_count should be status variable 
Make Prepared_stmt_count a global status variable, accessible via
SHOW STATUS LIKE 'Prepared_stmt_count';.  Documentation should be
updated.
 2006-11-21 16:49:18 +03:00
gluh@mysql.com/gluh.(none)
ff38409128 Bug#22413 EXPLAIN SELECT FROM view with ORDER BY yield server crash 
disable filling of I_S tables for EXPLAIN
 2006-11-21 13:45:01 +04:00
monty@mysql.com/nosik.monty.fi
306b871d52 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-11-20 22:46:52 +02:00
monty@mysql.com/nosik.monty.fi
e825879800 Remove compiler warnings 
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
 2006-11-20 22:42:06 +02:00
msvensson@neptunus.(none)
8809a5e27e mysql_client_test not found when running from binary dist 
Look in bin for myql_client_test executable
 2006-11-20 13:02:49 +01:00
holyfoot/hf@mysql.com/deer.(none)
bcfed657e7 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mysql-5.0-mrg
 2006-11-19 22:16:13 +04:00
holyfoot/hf@mysql.com/deer.(none)
dbda18e9df Merge mysql.com:/home/hf/work/mysql-4.1-mrg 
into  mysql.com:/home/hf/work/mysql-5.0-mrg
 2006-11-19 20:48:26 +04:00
dfischer/df@kahlann.erinye.com
bc8c59c1a8 adaption from 4.1 2006-11-17 17:02:28 +01:00
dfischer/df@kahlann.erinye.com
88ac15ddd1 MTR_BUILD_THREAD=auto selects a value for MTR_BUILD_THREAD from a pool (WL#2690) 2006-11-17 16:52:21 +01:00
joerg@trift2.
f9e9ce60e8 Merge trift2.:/MySQL/M50/yassl-win-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-17 16:30:08 +01:00
joerg@trift2.
0aee63517e Maintain the (old) VC project files, ehere yaSSL is concerned: 
"mySTL" has become a subdirectory of "taocrypt", was a sibling previously.
 2006-11-17 16:09:37 +01:00
kroki/tomash@moonlight.intranet
f8149f79a3 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383
 2006-11-17 15:04:26 +03:00
kroki/tomash@moonlight.intranet
f6e4e2317e Fix after manual merge: remove dead declaration. 2006-11-17 13:56:11 +03:00
holyfoot/hf@mysql.com/deer.(none)
5906c3868f ABI fix 2006-11-17 14:30:08 +04:00
kroki/tomash@moonlight.intranet
d1af1d5c29 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23383
 2006-11-17 12:41:17 +03:00
kroki/tomash@moonlight.intranet
e7ebeac561 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383
 2006-11-17 12:40:42 +03:00
kroki/tomash@moonlight.intranet
6d4558f7c3 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23383 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383
 2006-11-17 12:30:26 +03:00
kroki/tomash@moonlight.intranet
5e2ef3a68e BUG#23383: mysql_affected_rows() returns different values than 
mysql_stmt_affected_rows()

The problem was that affected_rows for prepared statement wasn't updated
in the client library on the error.  The solution is to always update
affected_rows, which will be equal to -1 on the error.
 2006-11-17 12:21:32 +03:00
holyfoot/hf@mysql.com/deer.(none)
dac2d0fcba merging 2006-11-17 12:02:36 +04:00
holyfoot/hf@mysql.com/deer.(none)
950665fc3b merging 2006-11-17 11:15:40 +04:00
holyfoot/hf@mysql.com/deer.(none)
e95e23b0f3 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/mysql-5.0-0mrg
 2006-11-17 10:30:16 +04:00
bell@desktop.sanja.is.com.ua
d56ab5afb6 Fix of debbuging mode of query cache (proposed by Monty reviewed by me). 2006-11-17 08:18:10 +02: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
holyfoot/hf@mysql.com/deer.(none)
2963d8ddd2 merging 2006-11-16 21:23:34 +04: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
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
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
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
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