summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* join_nested.test, join_nested.result:igor@rurik.mysql.com2004-06-1014-240/+3149
* - portability fix for IBM AIX and QNXlenz@kallisto.local2003-12-221-1/+1
* Merge mysql.com:/my/mysql-4.1 into mysql.com:/my/mysql-5.0monty@mysql.com2003-12-2113-35/+59
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2003-12-2113-35/+59
| |\
| | * Portability fixes found during 5.0 test compilationmonty@mysql.com2003-12-2113-35/+59
* | | Fixed bug in replacation for not x86 platformsmonty@mysql.com2003-12-214-27/+27
* | | Portability fixmonty@mysql.com2003-12-211-1/+1
* | | Fixed memory leaks in SPmonty@mysql.com2003-12-213-159/+144
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2003-12-2118-50/+115
|\ \ \
| * | | Update for VC++monty@mysql.com2003-12-2118-50/+115
* | | | Merge mysql.com:/home/pem/work/mysql-4.1pem@mysql.com2003-12-204-32/+43
|\ \ \ \ | | |/ / | |/| |
| * | | univ.i, srv0srv.c:heikki@hundin.mysql.fi2003-12-202-31/+28
| | |/ | |/|
| * | srv0start.c, univ.i, configure.in:heikki@hundin.mysql.fi2003-12-203-1/+15
* | | Post-merge fixes.pem@mysql.comhem.se2003-12-203-66/+9
* | | Merge 4.1 to 5.0 (the prep stmt fixes in particular).pem@mysql.com2003-12-2057-1123/+1560
|\ \ \ | |/ / | | / | |/ |/|
| * Merge fixmonty@mysql.com2003-12-2049-687/+816
| |\
| | * Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safemonty@mysql.com2003-12-2049-686/+816
| * | one line was removed during mergekonstantin@oak.local2003-12-201-0/+1
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2003-12-208-430/+613
| |\ \ | | |/ | |/|
| | * Prepared_statement deployed instead of PREP_STMT. konstantin@oak.local2003-12-208-430/+613
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2003-12-193-20/+254
| |\ \
| | * | univ.i, ut0ut.h, ut0ut.c:heikki@hundin.mysql.fi2003-12-193-20/+254
| | |/
| * | merge with lex pointer change patchmonty@mysql.com2003-12-193-9/+8
| |\ \ | | |/ | |/|
| | * Fixed memory overrun bug in DELETE ... ORDER BYmonty@mysql.com2003-12-193-8/+8
* | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0guilhem@mysql.com2003-12-2064-921/+2926
|\ \ \
| * | | Now merge is done.guilhem@gbichot22003-12-208-112/+184
| * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0guilhem@mysql.com2003-12-19222-1373/+4542
| |\ \ \
| * | | | This is the final commit for Worklog tasks:guilhem@gbichot22003-12-1948-268/+370
| * | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0guilhem@mysql.com2003-12-1817-584/+2415
| |\ \ \ \
| | * | | | This will be pushed only after I fix the testsuite.guilhem@gbichot22003-12-1817-584/+2415
* | | | | | Merge mysql.com:/home/psergey/mysql-5.0-latest-pullsergefp@mysql.com2003-12-20222-1373/+4542
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Post merge fix.pem@mysql.comhem.se2003-12-191-1/+0
| * | | | | Merging lex-pointer change from 4.1 to 5.0.pem@mysql.com2003-12-1917-33/+34
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | THD::lex now points to THD::main_lex like in 5.0konstantin@oak.local2003-12-1933-231/+233
| | | |_|/ | | |/| |
| * | | | Post-merge fixes.pem@mysql.comhem.se2003-12-193-62/+59
| * | | | Merge 4.1 to 5.0.pem@mysql.com2003-12-19188-1204/+3540
| |\ \ \ \ | | |/ / /
| | * | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@bar.intranet.mysql.r18.ru2003-12-195-5/+65
| | |\ \ \
| | | * | | Fix for Bug#2151:bar@bar.intranet.mysql.r18.ru2003-12-195-5/+65
| | * | | | after merge fixesmonty@mysql.com2003-12-195-4/+129
| | * | | | merge with 4.0.18monty@mysql.com2003-12-1926-35/+241
| | |\ \ \ \
| | | * | | | Fixed that lower_case_table_names is set to 1 for case insensitive file systems.monty@mysql.com2003-12-181-1/+2
| | | * | | | Removed compiler warningmonty@mysql.com2003-12-182-4/+5
| | | * | | | Simple cleanupsmonty@mysql.com2003-12-183-30/+25
| | | * | | | Code cleanupmonty@mysql.com2003-12-182-3/+6
| | | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2003-12-181-1/+1
| | | |\ \ \ \
| | | | * | | | Fixed typo. Affected INSERT DELAYED ... SELECT commandsmonty@mysql.com2003-12-171-1/+1
| | | * | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2003-12-171-0/+1
| | | |\ \ \ \ \
| | | | * | | | | Fix for BUG#2145 "mysqld becomes unreliable if unable to create a relay log w...guilhem@mysql.com2003-12-171-0/+1
| | | * | | | | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0vva@eagle.mysql.r18.ru2003-12-171-1/+1
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | fixed small error in types in sql/field.cc vva@eagle.mysql.r18.ru2003-12-171-1/+1