msvensson@pilot.blaudden
71e58855bf
Remove comment
2007-04-20 07:20:26 +02:00
msvensson@pilot.blaudden
da93a36a0e
mysql_upgrade portability fixes
2007-04-19 21:30:46 +02:00
msvensson@pilot.blaudden
2c95135c8d
mysql_upgrade depends on GenFixPrivs
2007-04-19 18:32:55 +02:00
msvensson@pilot.blaudden
41c41448b9
mysql_upgrade win fixes
2007-04-19 17:00:29 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
df75e6e50e
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b26851/b26851.5.0
2007-04-19 11:45:26 +05:00
tsmith@siva.hindu.god
39496731a2
Merge siva.hindu.god:/home/tsmith/m/bk/50
...
into siva.hindu.god:/home/tsmith/m/bk/maint/50
2007-04-18 14:50:32 -06:00
msvensson@pilot.blaudden
4e84ab3f82
Remove the check for value_start(if any it should be *value_start)
2007-04-18 19:00:42 +02:00
msvensson@pilot.blaudden
453b6180d0
Use my_snprintf instead of snprintf
2007-04-18 18:40:22 +02:00
msvensson@pilot.blaudden
6e6d942cb4
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-18 18:38:20 +02:00
msvensson@pilot.blaudden
905996141d
Use my_snprintf instead of snprintf
2007-04-18 18:38:03 +02:00
msvensson@pilot.blaudden
a8a8c8c181
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-18 16:56:32 +02:00
msvensson@pilot.blaudden
e9a9107f4f
Add mysql builtin $MYSQL_SERVER_VERSION and some function to make
...
it easier to set a variable from string or int
2007-04-18 16:56:17 +02:00
msvensson@pilot.blaudden
dd0d2146c3
Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-18 13:22:32 +02:00
msvensson@pilot.blaudden
20e622dcf3
Bug#25452 mysql_upgrade access denied
...
- Improve mysql_upgrade and add comments describing it's logic
- Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
was started from
- Don't look for mysql_fix_privilege_tables.sql randomly, compile
in the mysql_fix_privilege_tables.sql file and use that to upgrade
the system tables of MySQL
- Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
- Fix bug#26639, bug#24248 and bug#25405
2007-04-18 13:21:39 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e62dbcf746
Fix for
...
bug #27715 : mysqld --character-sets-dir buffer overflow
bug ##26851: Mysql Client --pager Buffer Overflow
Using strmov() to copy an argument may cause overflow
if the argument's length is bigger than the buffer:
use strmake instead.
Also, we have to encrease the error message buffer size to fit
the longest message.
2007-04-16 12:28:02 +05:00
jani@ua141d10.elisa.omakaista.fi
335153121b
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
2007-04-12 12:50:02 +03:00
lars/lthalmann@mysql.com/dl145h.mysql.com
904c75ede5
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-04-10 18:25:27 +02:00
msvensson@pilot.blaudden
3d847358de
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 17:17:08 +02:00
msvensson@pilot.blaudden
9917d018a6
Take into account wether vertical_results are in effect
2007-04-10 17:09:35 +02:00
msvensson@pilot.blaudden
73c6cde9d4
Init dying to 1 just after passing the guard
2007-04-10 17:06:36 +02:00
msvensson@pilot.blaudden
da2a216895
Add OPT_LOG_DIR
2007-04-10 17:05:22 +02:00
serg@janus.mylan
102f58fe34
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.0
2007-04-10 15:27:26 +02:00
serg@janus.mylan
1c678b34aa
Bug#27171 mysqlbinlog produces different output depends from option -R
...
a better fix, that works with 4.1 servers which don't send a fake
Format_description_log_event.
2007-04-10 15:26:35 +02:00
msvensson@pilot.blaudden
829ca34daf
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 14:46:57 +02:00
msvensson@pilot.blaudden
5c5271754b
Add --logdir option ot mysqltest
2007-04-10 14:45:13 +02:00
msvensson@pilot.blaudden
34a784f3d0
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 14:29:22 +02:00
msvensson@pilot.blaudden
60eb839e77
Merge 192.168.0.4:mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-04-10 13:51:32 +02:00
bar@mysql.com
9faaec9e1b
bug#27608 XML output is not well-formed
...
Problem: output was empty if the result is empty.
Fix: print XML header and footer, even if the result
is empty, to produce well-formed XML output.
2007-04-09 17:53:10 +05:00
msvensson@shellback.(none)
2df8524391
Add "query_sorted" command to mysqltest
...
Usage:
query_sorted <query>;
2007-04-05 20:12:56 +02:00
msvensson@pilot.blaudden
c3dc142df5
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-05 13:54:24 +02:00
msvensson@pilot.blaudden
9cd8b2b8fb
Protect against dying twice
...
Cleanup exit handling
2007-04-05 13:53:44 +02:00
msvensson@pilot.blaudden
3b1fc84a5e
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-04 15:17:00 +02:00
msvensson@pilot.blaudden
fc992b0667
Add "skip" function, makeing mysqltest return an
...
error code indicating test should be skipped
2007-04-04 15:15:40 +02:00
msvensson@pilot.blaudden
19801cbfdc
Add expansion of $variables in "let from query",
...
"if with query" and "while with query"
2007-04-04 15:09:12 +02:00
jamppa@bk-internal.mysql.com
cbfd66e754
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
2007-04-03 13:55:20 +02:00
msvensson@pilot.blaudden
bb9a601829
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-02 10:50:39 +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
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
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
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
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
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
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.
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