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
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 #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