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

26785 commits

This branch
This branch
All branches
Author SHA1 Message Date
kent@mysql.com
d8b9f5be41 init_db.sql: 
mysql.user.password doesn't need utf8
 2005-10-01 17:21:09 +02:00
kent@mysql.com
185b5636f4 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-09-30 22:01:34 +02:00
serg@mysql.com
78001860a6 Merge 2005-09-30 20:30:09 +02:00
serg@serg.mylan
bef3c587c6 Bug#11238 
"SELECT ... FOR UPDATE executed as consistent read inside LOCK TABLES"
Do not discard lock_type information as handler::start_stmt() may require knowledge.
(fixed by Antony)
 2005-09-30 20:20:10 +02:00
dlenev@mysql.com
85d4bc8f1b Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13629
 2005-09-30 20:28:24 +04:00
kent@mysql.com
c72092bdab Many files: 
Revert back 5.0 changes to Visual Studio .Net project files
 2005-09-30 16:44:31 +02:00
kent@mysql.com
7b2e04d5a2 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-09-30 16:37:02 +02:00
kent@mysql.com
664503deca Removed all Visual Studio .Net .vcproj files to be able to 
back-port to 4.1 and merge forward to 5.x again properly.
 2005-09-30 16:33:27 +02:00
dlenev@mysql.com
e0cfaeaaf6 Fix for bug #13629 "view test crashes for debug build" (also includes better 
fix for bug #13451 "view test produces warning about unfreed memory").
 2005-09-30 17:30:33 +04:00
kent@mysql.com
21cf818a8d Many files: 
New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver
 2005-09-30 14:03:55 +02:00
joerg@mysql.com
ac259199e0 Merge mysql.com:/M50/noserver-5.0 into mysql.com:/M50/mysql-5.0 2005-09-30 12:49:14 +02:00
joerg@mysql.com
c90673de8b Change "mf_keycache.c" so that it can be compiled without thread support (bug#11680): 
"configure --without-server"   (without giving "--enable-thread-safe-client").
 2005-09-30 12:44:45 +02:00
sergefp@mysql.com
49954f6735 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-sept30-test
 2005-09-30 14:21:10 +04:00
sergefp@mysql.com
3625ec5127 BUG#13081: Disable ROR-index_merge for NDB tables (by adding a 
HA_KEY_SCAN_NOT_ROR index flag) as NDB index scans are not guaranteed to be ROR 
scans.
 2005-09-30 14:20:15 +04:00
serg@serg.mylan
fff2737b0e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-30 12:04:10 +02:00
serg@serg.mylan
8c813c0a16 duplicate error message removed 2005-09-30 12:01:39 +02:00
guilhem@mysql.com
fd9a6f9750 Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle. 2005-09-30 10:58:24 +02:00
msvensson@neptunus.(none)
12c443d0fe Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-09-30 10:40:48 +02:00
serg@serg.mylan
69909c460a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-30 09:40:49 +02:00
ramil@mysql.com
4dbe76d035 Comment adjusted (see fix for #13545) 2005-09-30 12:37:58 +05:00
ramil@mysql.com
63fa48c0f6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2005-09-30 12:30:32 +05:00
stewart@mysql.com
dea64fb643 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-09-30 14:45:02 +10:00
stewart@mysql.com
bb4f408112 more post-merge fixes for SingleUser log events 2005-09-30 14:44:24 +10:00
stewart@mysql.com
43d244652b Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
 2005-09-30 14:34:53 +10:00
sergefp@mysql.com
10860b1108 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug13455
 2005-09-30 07:07:50 +04:00
sergefp@mysql.com
e0268dbcfd Adjust test results changed because of fix for BUG#13455 2005-09-30 07:06:04 +04:00
acurtis@xiphis.org
2e4a1862da Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  xiphis.org:/usr/home/antony/work2/p2-bug10586.5
 2005-09-30 00:09:51 +01:00
acurtis@xiphis.org
39bbba6e55 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  xiphis.org:/usr/home/antony/work2/p2-bug10586.5
 2005-09-29 23:54:46 +01:00
kent@mysql.com
822a4ac5bb mtr_report.pl: 
Text formatting, adjust table header
mysql-test-run.pl:
  Remove requirement for source tree to run embedded server test
mysqldump.test:
  Removed ending ';' from --exec line
 2005-09-30 00:52:18 +02:00
sergefp@mysql.com
7d383eecb5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug13455
 2005-09-30 01:38:04 +04:00
sergefp@mysql.com
71d8990f8e Fix for BUG#13455: Make "ref" optimizer able to make this inference: 
"t.key BETWEEN c1 AND c2" and c1 = c2 -> can access table t using "t.key = c1".
 2005-09-30 01:34:19 +04:00
patg@krsna.patg.net
328f5ef534 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
 2005-09-29 13:54:36 -07:00
patg@krsna.patg.net
a0119345e1 New flags for new max-no-ndb build script to get a build that has 
everything except NDB
 2005-09-29 13:45:39 -07:00
kent@mysql.com
3b906e73d8 portability.h: 
Corrected OpenServer ifdef test
Makefile.am:
  Added test-pl and test-force-pl targets
 2005-09-29 19:37:03 +02:00
pem@mysql.com
44b4e9fc82 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-29 16:41:46 +02:00
ramil@mysql.com
920e456549 fix for bug #13545: Server crash caused by select query. 2005-09-29 19:34:21 +05:00
georg@lmy002.wdf.sap.corp
e445a3d8e3 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0
 2005-09-29 16:15:00 +02:00
pem@mysql.com
f85dd7cee5 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-29 15:53:28 +02:00
ingo@mysql.com
0e75a93af4 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-29 15:09:07 +02:00
ingo@mysql.com
bd417d158e Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-09-29 15:09:05 +02:00
ingo@mysql.com
4689bc8bf0 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-29 14:48:14 +02:00
pem@mysql.com
9f20feea5b Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-29 14:35:08 +02:00
lenz@mysql.com
54d60d7fa7 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-09-29 14:35:07 +02:00
gluh@eagle.intranet.mysql.r18.ru
cac5b085cd after merge fix 2005-09-29 17:21:32 +05:00
ingo@mysql.com
0af6e68acf Merge mysql.com:/home/mydev/mysql-4.1-4100 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-29 14:07:32 +02:00
lenz@mysql.com
68e6b0e21d Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-09-29 13:57:41 +02:00
lenz@mysql.com
443048f61c - fixed the removing of the RPM_BUILD_ROOT in the %clean section of the RPM 
spec file (the $RBR variable did not get expanded, thus leaving old build
   roots behind)
 2005-09-29 13:55:54 +02:00
ingo@mysql.com
5c93e799d8 Merge mysql.com:/home/mydev/mysql-4.0-4000 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-09-29 13:44:17 +02:00
ingo@mysql.com
1af69fca94 Bug#9112 - Merge table with composite index producing invalid results with some queries 
Second platform fix for floating point rounding.
 2005-09-29 13:37:30 +02:00
gluh@mysql.com
b36f63e3ab 4.1 -> 5.0 merge 2005-09-29 16:35:50 +05:00