msvensson@neptunus.(none)
2d0b93f955
Will do cset -x on this.
2005-06-22 20:44:32 +02:00
msvensson@neptunus.(none)
8018f99ce7
Merging
2005-06-22 20:43:10 +02:00
msvensson@neptunus.(none)
01b025c2d2
Fix so that my_progname is set to "mysqldump"
2005-06-22 20:37:14 +02:00
msvensson@neptunus.(none)
8e9c7a42df
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-22 20:24:10 +02:00
msvensson@neptunus.(none)
2dd6a58d58
BUG#9657 mysqldump xml ( -x ) does not format NULL fields correctly
...
- Importing the bug fixes by patch due to merge problems.
2005-06-22 20:22:54 +02:00
msvensson@neptunus.(none)
1199b4ec9d
Fix mysqldump for so that my_programname is set to "mysqldump".
...
Correct test results now when error message output is predictable.
2005-06-22 20:12:21 +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
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
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
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
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