mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24085 commits 2781 branches 343 tags 1.6 GiB
Commit graph

24085 commits

This branch
This branch
All branches
Author SHA1 Message Date
evgen@moonbone.local
30a0ad3a68 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  moonbone.local:/work/mysql-5.0-bug-11298
 2005-06-22 04:48:25 +04:00
evgen@moonbone.local
5097c6825e Fix bug#11298 insert into select from VIEW produces incorrect result 
when using ORDER BY

Insert were inserting data from last record fetched instead of inserting from 
temporary table.

Make Item_ref to save data from result_field if it's available rather then
from *ref on save_in_field() call.
 2005-06-22 04:45:10 +04:00
bell@sanja.is.com.ua
a05e50e29e fixed items cleunup for SP (BUG#10136) 2005-06-22 00:17:08 +03:00
elliot@mysql.com
a24336cdcb BUG#10442 Minor changes from code review 2005-06-21 15:40:58 -04:00
reggie@mdk10.(none)
93b38c5f67 Bug #9148 Denial of Service 
my_access.c:
  Fixed problem where in some cases check_if_legal_filename was returning 0 for illegal names
 2005-06-21 13:35:12 -05:00
elliot@mysql.com
2eb7301081 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug10442
 2005-06-21 14:28:55 -04:00
kent@mysql.com
26dc9492c3 mysql-test-run.pl: 
Added optional paths for finding mysqld on Windows
  Added language/charset options to embedded mysql_client_test
 2005-06-21 20:25:50 +02:00
evgen@moonbone.local
b625e43485 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  moonbone.local:/work/mysql-4.1-bug-10886
 2005-06-21 22:25:49 +04:00
evgen@moonbone.local
dc381ea960 Fix bug #10886 - INSERT ... SELECT ... ON DUPLICATE KEY UPDATE produces bad results 
Temporary field wasn't restored to default values after ON DUPLICATE KEY
 UPDATE event, which results in wrong data being inserted in new record.
 2005-06-21 22:24:58 +04:00
bell@sanja.is.com.ua
93d0763b70 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-21 20:44:18 +03:00
bell@sanja.is.com.ua
a7ca9cb38e fixed view fields names check and generation (changed after Trudy review: underlying field names treat as user set ones) (BUG#7448) 2005-06-21 20:30:48 +03:00
igor@rurik.mysql.com
a626ab4c96 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-06-21 10:15:22 -07:00
konstantin@mysql.com
9eb671459a A preparatory patch to help adding JOIN::transform() and move one-time 
query transformations to the PREPARE stage (prepared statements).
 2005-06-21 21:15:21 +04:00
evgen@moonbone.local
e7e5cb29cb Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  moonbone.local:/work/mysql-5.0-bug-7422
 2005-06-21 21:15:20 +04:00
evgen@moonbone.local
e94f16a125 Fix bug #7422 "order by" doesn't work 
Field with wrong buffer was used to make sort key, which results in producing
same sort key for all records.
 2005-06-21 20:14:50 +04:00
igor@rurik.mysql.com
6a721d03d6 group_by.result, group_by.test: 
Correction for the test case of bug #11295 to remove
  warning.
 2005-06-21 08:15:49 -07:00
igor@rurik.mysql.com
295645b688 Manual merge 2005-06-21 06:26:02 -07:00
igor@rurik.mysql.com
3bfe28e9bf Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-21 06:19:06 -07:00
msvensson@neptunus.(none)
ddeaf342a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-06-21 14:24:13 +02:00
msvensson@neptunus.(none)[msvensson]
39636f48f0 patch 2005-06-21 14:19:56 +02:00
marko@hundin.mysql.fi
8cff472a83 log0log.c: 
log_checkpoint_margin(): Correct a typo that was introduced
  when fixing gcc 4.0 warnings.
 2005-06-21 14:55:20 +03:00
igor@rurik.mysql.com
bb944aa9dc Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
 2005-06-21 04:31:07 -07:00
igor@rurik.mysql.com
2104e9e668 group_by.result, group_by.test: 
Added a test case for bug #11295.
item_buff.cc:
  Fixed bug #11295.
  This a correction for the patch of bug #11088 that takes into
  account a possible NULL values of the BLOB column.
 2005-06-21 04:24:21 -07:00
marko@hundin.mysql.fi
a5cbbb7031 InnoDB: Remove some warnings reported by GCC 4.0.0. 2005-06-21 11:49:55 +03:00
lenz@mysql.com
acbfb38c02 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-06-21 10:37:29 +02:00
mskold@mysql.com
2716e772d4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-06-21 10:35:22 +02:00
mskold@mysql.com
981e845d8f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-06-21 08:59:37 +02:00
marko@hundin.mysql.fi
8934dfaa7b InnoDB: adjust test result 2005-06-21 08:16:36 +03:00
marko@hundin.mysql.fi
e992adcb3f Merge hundin.mysql.fi:/home/marko/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0-current
 2005-06-21 07:36:18 +03:00
kent@mysql.com
ff20e1c2ca Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-06-21 02:27:55 +02:00
kent@mysql.com
4958b54339 mysql-test-run.pl: 
More compact and safe handling of path names.
  Support for running in Windows source tree.
  Use libtool wrapper, instead of messing with
  library path names, and objects in .libs dir.
mtr_misc.pl:
  Utility function that search aand check path names
mtr_report.pl:
  Patch by Carsten, set correct reject/result/eval if not main suite
 2005-06-21 02:21:52 +02:00
jimw@mysql.com
99e35c84ac Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-20 15:02:45 -07:00
jimw@mysql.com
f36ee2a96d Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-20 14:48:04 -07:00
kent@mysql.com
9c79bc7e73 Merge 2005-06-20 22:31:25 +02:00
kent@mysql.com
9426710c68 mtr_cases.pl: 
Bug#11466: Script can now get test case name
  from test case file path on command line
mysql-test-run.pl:
  Bug#11466: Added --skip-ndbcluster/--skip-ndb option
mtr_cases.pl:
  Don't set --default-time-zone if opt file sets it
  Restart the server if time zone is given in opt file
mysql-test-run.pl:
  Don't remove symlink to "var" directory in cleanup
  Removed duplicate/unessesary options to mysqld
 2005-06-20 21:37:39 +02:00
kent@mysql.com
c7e501d883 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-06-20 21:25:54 +02:00
jimw@mysql.com
4d6c8d59a9 Merge jwinstead@production.mysql.com:my/mysql-4.1-win 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-20 12:07:41 -07:00
jimw@mysql.com
60aef4ba97 Merge jwinstead@production.mysql.com:my/mysql-4.1-10840 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-20 12:05:09 -07:00
jimw@mysql.com
27eace6304 Merge jwinstead@production.mysql.com:my/mysql-4.1-7858 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-20 12:04:22 -07:00
igor@rurik.mysql.com
28214f3da8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-20 10:52:38 -07:00
igor@rurik.mysql.com
acc6651d24 group_by.result: 
Added  a test case for bug #11385.
group_by.test:
  Added  a test case for bug #11385.
field.h:
  Fixed bug #11385.
  The bug was due to not defined method decimals for the class
  Field_datetime.
 2005-06-20 10:49:04 -07:00
jimw@mysql.com
5381e18673 Fix handling of command-line on Windows, missed as part of earlier 
commit. (Bug #10840)
 2005-06-20 18:54:45 +02:00
kent@mysql.com
fb09633eb1 Makefile.am: 
Corrected dependency for "lex_hash.h", to avoid occasional make failure
 2005-06-20 18:03:30 +02:00
mskold@mysql.com
91c422e029 Merge 2005-06-20 18:02:47 +02:00
mskold@mysql.com
d34fce5bf6 ha_ndbcluster.cc: 
Added CR for readability
 2005-06-20 17:17:44 +02:00
mskold@mysql.com
e8e6554a22 Added comment to store_lock 2005-06-20 17:16:22 +02:00
mskold@mysql.com
777ec78755 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-06-20 16:13:34 +02:00
igor@igor-inspiron.creware.com
7ea12bd787 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into igor-inspiron.creware.com:/home/igor/mysql-4.1
 2005-06-20 06:13:30 -07:00
dlenev@mysql.com
e28264d29f Manual merge of patch for bug#11060 "Server crashes on calling stored 
procedure with INSERT SELECT UNION SELECT" aka "Server crashes on
re-execution of prepared INSERT ... SELECT with UNION" into 5.0 tree.
 2005-06-20 16:58:02 +04:00
dlenev@mysql.com
b5b3b32d0a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg11060
 2005-06-20 16:07:36 +04:00