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

24170 commits

This branch
This branch
All branches
Author SHA1 Message Date
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)
e9e048f321 Merge fix 2005-06-22 15:29:08 +02:00
svoj@mysql.com
1b59ffb8a8 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/mnt/archive/svoj/mysql/mysql-5.0
 2005-06-22 17:17:40 +05: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
svoj@mysql.com
c275bde204 Better AR guessing. 2005-06-22 16:29:21 +05: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
marko@hundin.mysql.fi
2af4f441fe Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0-current
 2005-06-22 13:40:31 +03:00
konstantin@mysql.com
8b9bf75740 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-10736-new
 2005-06-22 14:40:30 +04:00
lenz@mysql.com
819fc8dd1f Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-06-22 12:38:38 +02:00
svoj@mysql.com
975cbd82c0 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
 2005-06-22 15:11:07 +05:00
svoj@mysql.com
55ae33e8f4 Better comment. 2005-06-22 15:10:12 +05:00
konstantin@mysql.com
dc7aa03ece Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-10736-new
 2005-06-22 14:00:22 +04:00
mskold@mysql.com
18804df51e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-06-22 11:51:18 +02:00
marko@hundin.mysql.fi
5f2ddcf580 InnoDB: Remove compilation warnings and errors on SGI IRIX. 2005-06-22 12:51:00 +03:00
marko@hundin.mysql.fi
eb42421e4a InnoDB: Replace for loops with memset() where possible. 2005-06-22 12:36:24 +03:00
marko@hundin.mysql.fi
3427c3304c Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0-current
 2005-06-22 12:36:23 +03:00
mskold@mysql.com
894390c109 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-06-22 11:36:22 +02:00
mskold@mysql.com
09d17627fd Made upgrade compatibility in 5.0 range to latest build version 2005-06-22 11:34:04 +02:00
mskold@mysql.com
c8398bcd2b Made upgrade compatibility in 4.1 range to latest build version 2005-06-22 11:18:40 +02:00
svoj@mysql.com
a8bcb25eda Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
 2005-06-22 14:11:23 +05:00
svoj@mysql.com
74373e7d54 WL#2286 - Compile MySQL w/YASSL support 
Fix GCC 4.0 link failure.
Better CXX_VERSION guessing.
 2005-06-22 14:08:28 +05:00
marko@hundin.mysql.fi
94b1429459 InnoDB: Correct a function comment. 2005-06-22 12:02:31 +03:00
petr@mysql.com
71b425bedb Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-06-22 12:41:29 +04:00
konstantin@mysql.com
a1bec5666f Adjust to the changed Query_arena constructor: 
main_mem_root is moved out of class Query_arena.
 2005-06-22 11:59:13 +04: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
bell@sanja.is.com.ua
ebe9b54871 make test result repeatable 2005-06-22 08:38:28 +03:00
petr@mysql.com
dff36b3e4e fix README file to be more verbose match actual situation (recomitted to push into 4.1) 2005-06-22 05:18:43 +02: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
petr@mysql.com
cb44682a35 Add a missing statement, add licensing info and correct coding style 2005-06-22 05:40:06 +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
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