lars/lthalmann@dl145j.mysql.com
771e05d657
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-03-29 13:49:10 +02:00
msvensson@pilot.blaudden
a16de88489
Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my51-bug24121
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-29 13:37:32 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
75668471d1
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-03-29 12:25:28 +02:00
joerg@trift-lap.fambruehe
4507c6757a
Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
...
into trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-03-29 09:41:39 +02:00
kent@mysql.com/kent-amd64.(none)
7eeae6ff13
Makefile.am:
...
Extended test section
Removed duplicate EXTRA_DIST
2007-03-28 23:18:43 +02:00
tsmith@siva.hindu.god
c01629a7cd
Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/51
...
into siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-03-28 11:47:28 -06:00
jani@ua141d10.elisa.omakaista.fi
3c3b0391f8
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-main
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
2007-03-28 20:46:42 +03:00
tsmith@siva.hindu.god
e64da592ce
Bug #26262 : Add option to skip binary logging for mysqlcheck
...
Add the --skip-write-binlog option, which adds NO_WRITE_TO_BINLOG
to REPAIR, ANALYZE, and OPTIMIZE commands.
Use this option when these SQL commands should not be sent to
replication slaves, nor run when using the binary logs for recovery
from backup
2007-03-28 10:19:10 -06:00
bar@bar.myoffice.izhnet.ru
f418475eec
Merge mysql.com:/home/bar/mysql-5.0.b25946
...
into mysql.com:/home/bar/mysql-5.1.b25946
2007-03-28 15:12:25 +05:00
msvensson@pilot.blaudden
b554258a8e
Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit
...
- Move the link_sources command from top level Makefile into each subdir
that need to link files
2007-03-27 23:56:48 +02:00
msvensson@pilot.blaudden
0559be3469
Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my50-bug24121
...
into pilot.blaudden:/home/msvensson/mysql/bug24121/my51-bug24121
2007-03-27 19:26:28 +02:00
msvensson@pilot.blaudden
ad649e3c2c
Bug#24121 Incorrect test for SSL_VERIFY_SERVER_CERT
...
- Interpret the pointer passed to 'mysql_options' for
MYSQL_OPT_SSL_VERIFY_SERVER_CERT as a my_bool
- In 5.1 the mysql_options signature will be chanegd to take
a 'void*' in order to further emphasize the need for a pointer
to correct type
2007-03-27 19:26:01 +02:00
jani@ua141d10.elisa.omakaista.fi
e12ad391b5
Fixes for 4.1 to be as in 5.0 and above.
2007-03-27 18:51:02 +03:00
bar@mysql.com
5e52cd3650
Bug#25946 Namespace not include for xsi usage within --xml output with null/nil values
...
Fix: adding namespace reference into "mysql --xml" output,
to make it work similary to "mysqldump --xml".
2007-03-27 13:30:43 +05:00
brian@zim.(none)
68cdfea52a
Merge zim.(none):/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/slap-5.1
2007-03-26 02:29:09 -07:00
brian@zim.(none)
9a2a7071be
Added pre and post option to test run (allows me to adjust an engine once all of the data has been loaded).
...
Kinda obvious that this was going to come up ;)
2007-03-26 02:24:49 -07:00
ramil/ram@ramil.myoffice.izhnet.ru
f5a24e5870
Merge mysql.com:/home/ram/work/b25993/b25993.5.0
...
into mysql.com:/home/ram/work/b25993/b25993.5.1
2007-03-26 13:01:46 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
74b3cdb02e
Fix for bug #25993 : mysqldump crashes with merge table and -c option
...
opt_complete_insert was improperly used by accident.
Use complete_insert flag instead.
2007-03-26 12:56:41 +05:00
serg@sergbook.mysql.com
237ed0c3e5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2007-03-24 17:16:53 +02:00
monty@narttu.mysql.fi
28a05d3b33
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into mysql.com:/home/my/mysql-5.1
2007-03-24 11:06:09 +02:00
dkatz/Damien@damiendev.
6a7ef1849a
bug#26346
...
Fix to a memory leak found by a complier warning.
2007-03-23 19:30:25 -04:00
dkatz/Damien@damiendev.
8cb8bf0ed0
Merge damiendev.:C:/build/dev50
...
into damiendev.:C:/build/mysql-5.1
2007-03-23 18:22:57 -04:00
dkatz/Damien@damiendev.
53ecf4207e
bug#26346
...
Added some fixes for an existing memory leak and unitilialized variables, both caught by gcc.
2007-03-23 18:15:11 -04:00
tnurnberg@sin.intern.azundris.com
3260dfd324
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into sin.intern.azundris.com:/home/tnurnberg/26817/51-26817
2007-03-23 20:43:40 +01:00
tnurnberg@sin.intern.azundris.com
998190ac55
Merge sin.intern.azundris.com:/home/tnurnberg/26817/50-26817
...
into sin.intern.azundris.com:/home/tnurnberg/26817/51-26817
2007-03-23 20:39:37 +01:00
baker@bk-internal.mysql.com
503d7b20cb
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-03-23 20:25:36 +01:00
tnurnberg@sin.intern.azundris.com
7c63826894
Bug #26817 : mysqldump fails to backup database containing view with invalid definer
...
give some leeway on required permissions for SHOW FIELDS on views so
an unknonwn DEFINER will no longer break mysqldump
2007-03-23 19:24:03 +01:00
antony@ppcg5.local
d4d37f113e
WL#2936
...
"Server variables for plugins"
Post review fixes.
2007-03-23 10:14:46 -07:00
serg@sergbook.mysql.com
2810a5a266
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2007-03-23 17:56:58 +02:00
serg@sergbook.mysql.com
37e7a07465
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2007-03-23 16:29:38 +02:00
Damien@damiendev.
ef3bbc426c
additional changes to merge fix for bug 26346
2007-03-22 20:36:58 -04:00
Damien@damiendev.
db6f8d8ff8
Merge damiendev.:C:/build/mysql-5.1/..\dev50
...
into damiendev.:C:/build/mysql-5.1
2007-03-22 20:08:05 -04:00
Damien@damiendev.
53679c03ad
Merge damiendev.:C:/build/mysql-5.0
...
into damiendev.:C:/build/dev50
2007-03-22 15:55:18 -04:00
serg@sergbook.mysql.com
25b49e99cd
Bug#27171 mysqlbinlog produces different output depends from option -R
...
Server starts any binlog dump from Format_description_log_event,
this shifted all offset calculations in mysqlbinlog and made it
to stop the dump earlier than --stop-position. Now mysqlbinlog
takes Format_description_log_event into account
2007-03-22 20:55:59 +02:00
jani@ua141d10.elisa.omakaista.fi
5c542a4656
Fixed compiler warnings.
2007-03-22 20:32:07 +02:00
Damien@damiendev.
0fc5ad1e91
Bug#26346: stack + buffer overrun in mysqldump
...
Fixes to buffer overlows from long command line args, and unchecked dyn_str return codes. Also light refactoring.
2007-03-22 13:35:29 -04:00
guilhem@gbichot3.local
21492b54b4
Fix for BUG#26194 "mysqlbinlog --base64-output produces invalid SQL";
...
when it was printing a Query event, it produced invalid SQL (missing
the BINLOG keyword, so the SQL started with the base64 string, which
is incorrect).
Note: no testcase; I have a .test which shows that the bugfix works,
but it triggers BUG#26361 and so gives Valgrind warnings. I'm sending
this test to the fixer of BUG#26361 for her/him to push when she/he
fixes BUG#26361.
2007-03-22 17:31:39 +01:00
jamppa@bk-internal.mysql.com
d2838b5abe
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-03-22 13:14:52 +01:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
2527b6ba1b
fixes for 5.1-arch repository
2007-03-22 01:59:47 -07:00
Antony@floppy.
adfdcb191c
Fixes for 5.1-arch repository to compile on Windows.
2007-03-22 00:43:14 -07:00
tsmith@quadxeon.mysql.com
54e7bc8daa
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-22 01:04:39 +01:00
iggy@recycle.(none)
9800fbf0b6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into recycle.(none):/src/bug23736/my50-bug23736
2007-03-21 13:43:03 -04:00
iggy@recycle.(none)
0d3aefcdf4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into recycle.(none):/src/bug23736/my51-bug23736
2007-03-21 13:39:08 -04:00
msvensson@pilot.blaudden
31b2f339a0
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-21 14:30:47 +01:00
msvensson@pilot.blaudden
7c5df4d35b
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-21 14:24:50 +01:00
msvensson@pilot.blaudden
3bf2a52225
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-20 23:53:25 +01:00
msvensson@pilot.blaudden
8f3d9cb415
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-20 21:24:20 +01:00
tsmith@quadxeon.mysql.com
2250d1a752
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
2007-03-20 21:05:48 +01:00
msvensson@pilot.blaudden
5b62c51a05
Remove the variables for long gone disable_ps_warnings
2007-03-20 19:43:36 +01:00
kent@kent-amd64.(none)
240bbc6d29
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-20 19:04:02 +01:00