mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-08 04:03:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
23958 commits 2857 branches 349 tags 1.6 GiB
Commit graph

23958 commits

Author SHA1 Message Date
patg@radha.local
7f5d7d47b3 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into radha.local:/Volumes/disk2s1/mysql-5.0
 2005-06-22 21:23:33 +02:00
konstantin@mysql.com
6a0adade83 Remove THD::stmt_backup 2005-06-22 23:12:25 +04:00
patg@radha.local
144045ffae Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into radha.local:/Volumes/disk2s1/mysql-5.0
 2005-06-22 19:40:46 +02:00
patg@radha.local
172dab875b Bug# 9926, This is the same as changeset 1.1934, which was approved by Monty 2005-06-22 19:29:34 +02:00
kent@mysql.com
0c72aa5ef2 mtr_cases.pl: 
Add a slave when running the federated test case
 2005-06-22 19:07:34 +02:00
elliot@mysql.com
bafab2dd6f 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:33 -04:00
elliot@mysql.com
0f92a2cfd6 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:32 -04:00
kent@mysql.com
35c939d3c4 mysql-test-run.pl: 
Bug#11481, set charset directory to mysqlbinlog
 2005-06-22 19:07:31 +02:00
elliot@mysql.com
776fc4364f Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1-merge2 
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
 2005-06-22 13:07:31 -04:00
kent@mysql.com
c4fe91b7da Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-06-22 19:07:30 +02:00
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 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
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
svoj@mysql.com
c275bde204 Better AR guessing. 2005-06-22 16:29:21 +05: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
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
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
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
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 - 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