database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-31 15:50:51 +03:00
Code Activity
25,082 Commits 3,251 Branches 1,092 Tags
aadcf0d35b49a411547bcccdcb1516ca5711b1b0
Commit Graph

6342 Commits

Author SHA1 Message Date
elliot@mysql.com
7ddb53c9c4 Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
 2005-06-22 13:07:30 -04:00
sergefp@mysql.com
7e7987eed9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug8441
 2005-06-22 19:07:29 +02:00
elliot@mysql.com
201f3a7865 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1-merge 
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
 2005-06-22 13:07:29 -04:00
evgen@moonbone.local
473d7d59a7 Fix for bug #10886 merge 2005-06-22 21:07:28 +04:00
sergefp@mysql.com
aef810cbba Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug8441
 2005-06-22 17:34:15 +02:00
lars@mysql.com
008548150c BUG#9361: Added test cases 2005-06-22 17:12:02 +02:00
msvensson@neptunus.(none)
9258513c1e Bug #9558 mysqldump --no-data db t1 t2 format still dumps data 
- Check the Dflag variable inside of function dump_table to see if data should be
dumped or not.
    - Add test for --xml and --no-data as well
    Reapplying patch!
 2005-06-22 15:43:49 +02:00
msvensson@neptunus.(none)
fd82fd86bc Merge to 5.0 2005-06-22 15:32:05 +02:00
msvensson@neptunus.(none)
94e37bc3fc Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050622121209|37729 2005-06-22 14:16:26 +02:00
msvensson@neptunus.(none)
777e1d785c Should not be changed 2005-06-22 14:12:09 +02:00
msvensson@neptunus.(none)
85b9ffc4ca Merged from mysql-4.1 to mysql-5.0 2005-06-22 14:10:02 +02:00
msvensson@neptunus.(none)
61a3e16bfd Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug10589
 2005-06-22 12:41:33 +02:00
bell@sanja.is.com.ua
53595de2c1 test made independent 2005-06-22 08:52:06 +03:00
bell@sanja.is.com.ua
a4a7735b33 merge 2005-06-22 08:42:03 +03:00
evgen@moonbone.local
2235ea9593 Fix bug #9728 decreased functionality in "on duplicate key update" 
Remove changes made by bug fix #8147. They strips list of insert_table_list to
only insert table, which results in error reported in bug #9728.
Added flag to Item to resolve ambigous fields reported in bug #8147.
 2005-06-22 07:18:42 +04:00
bell@sanja.is.com.ua
f8c237bd4a 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-22 03:48:26 +03:00
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
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
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
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
monty@mishka.local
1524cd001d Cleanup during review of new code 
Fixed wrong allocation that could cause buffer overrun when using join cache
 2005-06-21 18:18:58 +03: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
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
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
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
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
4429756e53 Fix crash when an entry was added to the mysql.tables_priv 
table with an empty hostname. (Bug #11330)
 2005-06-20 10:21:35 -07:00
mskold@mysql.com
91c422e029 Merge 2005-06-20 18:02:47 +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
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