mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33916 commits 2778 branches 343 tags 1.6 GiB
Commit graph

33916 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ramil/ram@mysql.com/myoffice.izhnet.ru
8512b7e5bd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug21789/my41-bug21789
 2006-11-22 14:06:37 +04:00
msvensson@neptunus.(none)
88d2c9d130 Merge neptunus.(none):/home/msvensson/mysql/bug20589/my41-bug20589 
into  neptunus.(none):/home/msvensson/mysql/bug20589/my50-bug20589
 2006-11-22 09:52:56 +01:00
msvensson@neptunus.(none)
0a27881be5 Bug #20589 Missing some table level privileges after upgrade 
- Update comments to reflect correct version
 2006-11-22 09:52:31 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
802f7fc366 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
 2006-11-22 12:40:15 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b11dba2f0b Merge mysql.com:/usr/home/ram/work/bug21789/my41-bug21789 
into  mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
 2006-11-22 12:10:18 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
711b6a63be Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
 2006-11-22 10:52:44 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c6e856de10 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug22029/my41-bug22029
 2006-11-22 10:30:46 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b1a423d9f6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
 2006-11-22 10:27:11 +04:00
iggy@rolltop.ignatz42.dyndns.org
e2a6759c4a Bug#19799 delimiter command not working correctly when sourcing a sql file 
- Use more appropriate test case.
 2006-11-22 01:27:06 -05:00
iggy@rolltop.ignatz42.dyndns.org
26e05951ab Bug#19799 delimiter command not working correctly when sourcing a sql file 
- Post Merge Fix.
 2006-11-22 00:52:32 -05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0a415e360c Merge mysql.com:/usr/home/ram/work/bug22029/my41-bug22029 
into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
 2006-11-22 09:19:51 +04:00
iggy@rolltop.ignatz42.dyndns.org
bface97ecc Bug#19799 delimiter command not working correctly when sourcing a sql file 
- Client side readline functions unconditionally search for Unix '\n' line
endings. In this case, the delimiter statement was set to '//\r' instead 
of the intended '//'. When removing the '\n' check for and remove 
preceeding '\r' character as well.
 2006-11-21 21:10:02 -05:00
msvensson@neptunus.(none)
d89db5edf8 When runnig from binary dist the .sql files are found in share/ directory 2006-11-21 21:39:37 +01:00
sergefp@mysql.com
0421d489fb Fix typo in comment 2006-11-21 21:52:39 +03:00
msvensson@neptunus.(none)
f25590d8b7 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-21 16:50:40 +01:00
msvensson@neptunus.(none)
fe0fc2d637 Merge 192.168.0.4:mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-21 16:42:07 +01:00
msvensson@neptunus.(none)
9594462f72 Remove unused variable 2006-11-21 16:34:10 +01:00
msvensson@neptunus.(none)
13b5e6275a Add ALTER TABLE MODIFY statements in addition to the ALTER TABLE ADD for new 
columns to make sure they both exist and have the intended type
 2006-11-21 16:31:44 +01:00
msvensson@neptunus.(none)
66e3c220c6 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-21 15:58:05 +01:00
msvensson@neptunus.(none)
f1a63e9506 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-21 15:41:21 +01: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
msvensson@neptunus.(none)
7cf226de11 Rename system_mysql_db_fix.test to system_mysql_db_fix30020 as it tests 
mysql_fix_privilege_tables.s's ability to convert the system tables as of
3.20 to current system table format
Add similar test for 4.1.23 tables - but use "mysql < mysql_fix_privilege_tables.sql"
so it can be run on any platform.
 2006-11-21 15:31:11 +01:00
msvensson@neptunus.(none)
a14ae73f55 Get name for .reject and .log files from result file name 2006-11-21 15:16:12 +01: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
jonas@perch.ndb.mysql.com
2429b3ad3a Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-11-21 14:14:43 +01:00
jonas@perch.ndb.mysql.com
e9ac48f950 ndb - 
update error code list
  (for bug#24447)
 2006-11-21 14:06:20 +01:00
jonas@perch.ndb.mysql.com
70fdfc5521 ndb - bug#24447 
api disconnect just after SCAN_TABREQ
 2006-11-21 14:04:20 +01:00
jonas@perch.ndb.mysql.com
1d041fa5f9 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-11-21 12:01:44 +01:00
jonas@perch.ndb.mysql.com
ac79cbb1f8 ndb - 
Fix bug wrt to '\r' handling in latest commit to bug#24011
 2006-11-21 11:57:41 +01: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
msvensson@shellback.(none)
a9eb1b709a Add missing semicolon 2006-11-21 09:36:29 +01:00
msvensson@shellback.(none)
611540db32 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-21 00:51:34 +01:00
msvensson@shellback.(none)
fc144204da Port mysql_upgrade to be tested on windows 2006-11-21 00:46:13 +01:00
msvensson@shellback.(none)
4dc0aeb7b6 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-20 23:38:22 +01:00
msvensson@shellback.(none)
147eaa3c13 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-20 21:53:17 +01: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
cmiller@zippy.cornsilk.net
b24d39c9e7 Change collation for ALTER-omitted ENUMs from utf8_bin (where "y" and 
"Y" are different) to utf8_general_ci (where same).
 2006-11-20 15:37:22 -05:00
msvensson@shellback.(none)
3b57cf0f74 Fix mysqltest to automatically replace \ with / also in 
$MYSQLTEST_VARDIR, for usage of vardir=e:/var<nnn> on windows
 2006-11-20 21:03:40 +01:00
kaa@polly.local
346033a5da Fix for bug #22077 "DROP TEMPORARY TABLE fails with wrong error if read_only is set" 
Do not issue a 'read-only' error in case of DROP TEMPORARY TABLE on a non-existing temporary table.
Instead produce the correct "Unknown table" error or warning (in cases when the IF EXISTS clause was specified).

To a documentor: the part of the manual describing the 'read_only' system variable should be clarified to state the following:
"When the read_only variable is set to ON, all operations which create/update/drop tables are rejected with the exceptions for:
1. Any operation performed by the replication thread on a slave server
2. Any operation performed by a user that have the SUPER privilege
3. Any operation that creates/updates/drops only temporary tables"
 2006-11-20 17:35:23 +03: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