mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
23817 commits 2791 branches 343 tags 1.7 GiB
Commit graph

23817 commits

This branch
This branch
All branches
Author SHA1 Message Date
kent@mysql.com
e58054ad16 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-06-19 20:09:28 +02:00
kent@mysql.com
917276f254 mysql-test-run.pl: 
Added dummy --manager-port flag, for backward compatibility
  Back port from 5.0, correction of paths to SSL pem files
mtr_cases.pl:
  Removed hard coded exclude list for embedded server
mysql-test-run.pl:
  Set environment variable MYSQL_SHOW, to be used in test cases
 2005-06-19 20:06:27 +02:00
kent@mysql.com
32734072d0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-06-19 18:55:00 +02:00
gbichot@quadita2.mysql.com
63a351ea4f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-06-19 17:40:39 +02:00
gbichot@quadita2.mysql.com
c2ec0e7409 correcting error messages after discussion with Paul (replication of routines). 2005-06-19 17:39:08 +02:00
konstantin@mysql.com
82f3120541 Rewrite the test for Bug#9992. 2005-06-19 17:31:20 +04:00
konstantin@mysql.com
021c2d45cb Fix the test for Bug#11111: coding style, a compiler warning, don't 
use tabs.
 2005-06-19 17:02:31 +04:00
bell@sanja.is.com.ua
d75f6d74b5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-06-18 20:11:41 +03:00
serg@serg.mylan
3812e15c00 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-06-18 18:16:04 +02:00
serg@serg.mylan
07513c001c BSD make compatibility. bug#9828 2005-06-18 18:14:28 +02:00
acurtis@xiphis.org
07892fe219 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into xiphis.org:/usr/home/antony/work2/p3-bug6877.3
 2005-06-17 22:32:46 +01:00
acurtis@xiphis.org
51dd521dfc Bug#6877 MySQL should give an error if the requested table type is not available 
Implement new SQL mode - NO_ENGINE_SUBSTITUTION
 2005-06-17 22:14:44 +01:00
bell@sanja.is.com.ua
640027f7ba Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-06-17 23:53:51 +03:00
konstantin@mysql.com
362a83d2f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-10736
 2005-06-17 23:27:23 +04:00
konstantin@mysql.com
b3d977df10 Rename all prepared statements COM_ commands to prefix with COM_STMT_ 2005-06-17 23:26:25 +04:00
bell@sanja.is.com.ua
6d030c637b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-06-17 20:30:11 +03:00
bell@sanja.is.com.ua
a11677026f fixed printing of sum(distinct ) & avg(distinct ) & cast(... as decimal) (BUG#7015, BUG#11387) 2005-06-17 17:27:47 +03:00
serg@serg.mylan
637a353d93 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-17 14:54:59 +02:00
tulin@dl145c.mysql.com
c78b19768d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
 2005-06-17 14:21:37 +02:00
lars@mysql.com
74bd42fdab Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0 2005-06-17 14:08:56 +02:00
lars@mysql.com
41d1c094b6 Fix of 5.0 tree 2005-06-17 14:03:27 +02:00
tulin@dl145c.mysql.com
a6c19c2532 Merge dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
 2005-06-17 12:53:49 +02:00
tulin@dl145c.mysql.com
9b3d0b85a3 sql_select.cc: 
fixed 64bit bug in lenght store/retrive in cache
 2005-06-17 12:36:09 +02:00
serg@serg.mylan
516d0945a1 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-17 11:29:55 +02:00
marko@hundin.mysql.fi
d3d5d6b075 pars0lex.l: 
Add one more step to the patching instructions.
lexyy.c:
  Fix a Win64 type conversion warning
 2005-06-17 12:00:05 +03:00
konstantin@mysql.com
4f966145b0 Post-merge fixes. 2005-06-17 01:58:36 +04:00
konstantin@mysql.com
62dacf0813 Manual merge (4.1->5.0) 2005-06-17 00:34:35 +04:00
konstantin@mysql.com
dcb0e65dcb Fix Bug#9334 "PS API queries in log file" and 
Bug#8367 "low log doesn't gives complete information about prepared 
statements"
Implement status variables for prepared statements commands (a port of
the patch by Andrey Hristov).
See details in comments to the changed files.
No test case as there is no way to test slow log/general log in 
mysqltest.
 2005-06-17 00:11:48 +04:00
serg@serg.mylan
215ff9e165 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-16 21:27:51 +02:00
konstantin@mysql.com
f10b395982 A fix for Bug#9141 "4.1 does not log into slow log 
ALTER, OPTIMIZE and ANALYZE statements".
In 4.1 we disabled logging of slow admin statements. The fix adds an 
option to enable it back.
No test case (slow log is not tested in the test suite), but tested
manually.
+ post-review fixes (word police mainly).
 2005-06-16 23:05:38 +04:00
igor@rurik.mysql.com
ad223c9c10 group_by.result, group_by.test: 
Correction after merge of fix for bug #8614.
 2005-06-16 11:59:00 -07:00
igor@rurik.mysql.com
86a314cc7b Manual merge 2005-06-16 10:04:41 -07:00
igor@rurik.mysql.com
deaf7f9608 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-06-16 09:49:04 -07:00
igor@rurik.mysql.com
2095758a9d group_by.result, group_by.test: 
Added a test case for bug #8614.
sql_select.cc:
  Fixed bug #8614.
  SELECT DISTINCT ... GROUP BY 'const' must be equivalent to
  SELECT ... GROUP BY 'const'.
 2005-06-16 09:45:41 -07:00
joerg@mysql.com
f0caf7d58c Merge mysql.com:/M50/clone-5.0.7 into mysql.com:/M50/mysql-5.0 2005-06-16 18:30:19 +02:00
konstantin@mysql.com
33cdc548a1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-root
 2005-06-16 20:09:38 +04:00
serg@serg.mylan
cccc4da7d6 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-16 18:07:19 +02:00
matthias@three.local.lan
a785b84ea1 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-B
 2005-06-16 17:37:04 +02:00
timour@mysql.com
64df4e1170 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into mysql.com:/home/timka/mysql/src/5.0-dbg
 2005-06-16 18:11:35 +03:00
timour@mysql.com
375e79bb6e Post-fix for BUG#11211 
Exclude the query that generates warning from PS tests, due to extra warning
under PS.
 2005-06-16 18:03:51 +03:00
lars@mysql.com
869882f321 WL#2076: Added if(...) construct to mysqltest 
Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
 2005-06-16 16:56:03 +02:00
matthias@three.local.lan
05579bd83e Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-B
 2005-06-16 16:24:33 +02:00
serg@serg.mylan
6db4760677 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-16 15:33:48 +02:00
joerg@mysql.com
bb885d0301 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-06-16 15:17:28 +02:00
konstantin@mysql.com
7602e1591f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-root
 2005-06-16 16:36:53 +04:00
serg@serg.mylan
e9b47ad3c7 merged 2005-06-16 14:35:15 +02:00
serg@serg.mylan
b060900a3d Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-06-16 14:27:32 +02:00
mleich@mysql.com
973d7ed59b Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src-B
 2005-06-16 14:15:55 +02:00
joerg@mysql.com
bd0386839c "configure.in": Correct equality comparison: In shell 'test', it is single '=' (bug#11007). 2005-06-16 13:44:08 +02:00
svoj@mysql.com
c5aac62c95 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
 2005-06-16 16:41:33 +05:00