cmiller@zippy.cornsilk.net
ca7ade8825
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-28 07:30:24 -04:00
cmiller@zippy.cornsilk.net
c0ab40d390
Bug#21476: (Thread stack overrun not caught, causing SEGV)
...
The STACK_MIN_SIZE is currently set to 8192, when we actually need
(emperically discovered) 9236 bytes to raise an fatal error, on Ubuntu
Dapper Drake, libc6 2.3.6-0ubuntu2, Linux kernel 2.6.15-27-686, on x86.
I'm taking that as a new lower bound, plus 100B of wiggle-room for sundry
word sizes and stack behaviors.
The added test verifies in a cross-platform way that there are no gaps
between the space that we think we need and what we actually need to report
an error.
DOCUMENTERS: This also adds "let" to the mysqltest commands that evaluate
an argument to expand variables therein. (Only right of the "=", of course.)
2006-09-27 14:42:56 -04:00
lars/lthalmann@mysql.com/dl145h.mysql.com
bbf84d6b9e
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-23 06:00:50 +02:00
georg@lmy002.wdf.sap.corp
ca00ba4991
Added build rule for mysql_upgrade.exe
2006-09-22 07:38:24 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
d20e326504
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-21 00:05:56 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
7f410eed5e
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug21142/my41-bug21142
2006-09-18 09:06:05 +05:00
ted@ted.mysql.internal
5610ef3018
Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-maint
...
into ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca
2006-09-15 04:32:58 +04:00
ted@ted.mysql.internal
cb08c534a0
Bug#21011 The [client] group header was overwritten by "password" option in upgrade_defaults file which confused mysqlcheck thus used to prevent the whole thing from running correctly when the "--password=" option is specified on mysql_upgrade command line with no corresponding "--user=" option
2006-09-15 04:01:47 +04:00
lars/lthalmann@mysql.com/dl145j.mysql.com
2840596e10
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-15 01:26:28 +02:00
iggy@rolltop.ignatz42.dyndns.org
02833f49c3
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my50-bug21424
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-09-14 16:37:22 -04:00
iggy@rolltop.ignatz42.dyndns.org
4fa6c8c776
Bug#21424 mysqldump failing to export/import views.
...
Dumps are created for the tables in each specified database then for the views in each specified database. This bug occurs when any database's views depend on the mysql database's table data while being restored.
Added command line option --flush-privileges to the mysqldump utility which causes a FLUSH PRIVILIGES statement to be written to the dump after the mysql database.
2006-09-14 14:56:14 -04:00
cmiller@zippy.cornsilk.net
ebf4d199df
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my50-bug21618
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-14 09:21:09 -04:00
cmiller@zippy.cornsilk.net
94382c313a
Bug #21618 : NULL shown as empty string in client
...
The column's NOT NULL flag doesn't affect what we should print. Remove the
wrong logic that does check it.
Also, verify that this and the previous two tests print the same data as
other output formats.
2006-09-13 11:41:41 -04:00
lars/lthalmann@mysql.com/dl145j.mysql.com
4c467cc438
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-11 13:17:51 +02:00
msvensson@neptunus.(none)
e40e56346d
Merge bk-internal:/home/bk/mysql-5.0-cmake
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-09-04 10:36:01 +02:00
grichter@bk-internal.mysql.com
6993e3a3f7
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake
2006-09-02 11:03:16 +02:00
georg@lmy002.wdf.sap.corp
5686da41ac
Fixes for crashes and test failures
2006-09-01 14:34:37 +02:00
msvensson@neptunus.(none)
8f378e0f3a
Fix problem with windows where stderr is not flushed until end of program.
2006-09-01 13:53:43 +02:00
georg@lmy002.wdf.sap.corp
9d6471c33e
make dist changes for Cmake build
2006-09-01 10:32:12 +02:00
tsmith@maint2.mysql.com
e2f40aa6d0
Merge maint2.mysql.com:/data/localhome/tsmith/bk/41
...
into maint2.mysql.com:/data/localhome/tsmith/bk/50
2006-09-01 08:53:56 +02:00
jimw@rama.(none)
2b8f30a764
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into rama.(none):/home/jimw/my/mysql-4.1-21288
2006-08-31 21:23:25 -07:00
jimw@rama.(none)
bd2825f5bb
Restore bug fix lost in merge of client/mysqldump.c, and clean up mysqldump.test
...
so that 4.1 and 5.0 tests are all in the right place and no tests are duplicated.
2006-08-31 20:53:34 -07:00
jimw@rama.(none)
5884eea9a3
Resolve conflicts
2006-08-31 18:24:37 -07:00
georg@lmy002.wdf.sap.corp
27636d9303
Additional files for cmake support
2006-08-31 19:52:42 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
f25b8f20d2
Fix for bug #21142 : Malformed insert causes a segmentation fault.
...
- possible stack overflow fixed.
2006-08-29 14:38:02 +05:00
iggy@rolltop.ignatz42.dyndns.org
bfe86ca448
Bug #21527 mysqldump incorrectly tries to LOCK TABLES on the information_schema database.
...
init_dumping now accepts a function pointer to the table or view specific init_dumping function. This allows both tables and views to use the init_dumping function.
2006-08-28 17:48:06 -04:00
iggy@rolltop.ignatz42.dyndns.org
8bc745456f
Bug #11972 : client uses wrong character set after reconnect.
...
The mysql client uses the default character set on reconnect. The default character set is now controled by the client charset command while the client is running. The charset command now also issues a SET NAMES command to the server to make sure that the client's charset settings are in sync with the server's.
2006-08-24 11:15:08 -04:00
cmiller@zippy.cornsilk.net
73963de637
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/m50-maint-b21224
2006-08-23 10:47:46 -04:00
msvensson@shellback.(none)
adaa3a2a60
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-21 14:09:38 +02:00
jimw@rama.(none)
abc148000d
Bug #21288 : mysqldump segmentation fault when using --where
...
The problem was that the error handling was using a too-small buffer to
print the error message generated. We fix this by not using a buffer at
all, but by using fprintf() directly. There were also some problems with
the error handling in table dumping that was exposed by this fix that were
also corrected.
2006-08-17 14:09:24 -07:00
cmiller@zippy.cornsilk.net
6998c5140b
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:53:12 -04:00
msvensson@shellback.(none)
a6a8ea0bc9
Remove duplicate free of "ds_res"
2006-08-16 20:38:33 +02:00
msvensson@shellback.(none)
b963293595
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-16 15:50:50 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
638300fa9e
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b17939
2006-08-15 14:41:29 +05:00
cmiller@zippy.cornsilk.net
8a33305959
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/m50-maint-b21224
2006-08-14 10:02:28 -04:00
cmiller@zippy.cornsilk.net
d6b00b72eb
Bug#21224: mysql_upgrade uses possibly insecure temporary files
...
We open for writing a known location, which is exploitable with a symlink
attack. Now, use the EXCLusive flag, so that the presence of anything at
that location causes a failure. Try once to open safely, and if failure
then remove that location and try again to open safely. If both fail, then
raise an error.
2006-08-11 15:31:06 -04:00
rburnett@bk-internal.mysql.com
6b399a498b
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-10 19:24:46 +02:00
cmiller@zippy.cornsilk.net
543fcde9b9
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
2006-08-09 22:23:41 -04:00
tnurnberg@salvation.intern.azundris.com
cbe81c301a
Bug#17926: mysql.exe crashes when ctrl-c is pressed in windows
...
SIGINT is handled in funny ways on windows, which could lead to problems when
Control-C was pressed in the client during a long-running query. Now Control-C
during a query aborts that query (by sending KILL to the server on a second
connexion), while Control-C outside of a running query terminates the client.
2006-08-10 03:46:46 +02:00
rburnett@bk-internal.mysql.com
86d74dc6dc
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-04 19:19:26 +02:00
rburnett@bk-internal.mysql.com
22c77e87a2
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-03 16:54:06 +02:00
msvensson@neptunus.(none)
10a7b8cedf
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-03 12:11:07 +02:00
msvensson@neptunus.(none)
61c5d97309
Remove double error printout in mysqldump
2006-08-03 12:09:22 +02:00
msvensson@neptunus.(none)
743948404a
Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21215
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-08-03 11:48:08 +02:00
msvensson@neptunus.(none)
7280f63100
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-03 09:32:58 +02:00
jimw@rama.(none)
9d67aacead
Merge rama.(none):/home/jimw/my/mysql-5.0-19147
...
into rama.(none):/home/jimw/my/mysql-5.0-16502
2006-08-02 19:52:11 -07:00
jimw@rama.(none)
95b3b2ea8d
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into rama.(none):/home/jimw/my/mysql-5.0-16502
2006-08-02 19:48:12 -07:00
cmiller@zippy.cornsilk.net
dd5eeaf676
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/m41-maint--07OBQ
2006-08-02 14:57:12 -04:00
kostja@bodhi.local
1b145118b9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
2006-08-02 21:54:10 +04:00
evgen@moonbone.local
83896aa8f6
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-08-02 18:11:59 +04:00
evgen@moonbone.local
7f0a080660
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-08-02 16:46:55 +04:00
kostja@bodhi.local
4bfc67fc3c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
2006-08-02 14:13:01 +04:00
holyfoot/hf@mysql.com/deer.(none)
6ebfbf561a
Merge bk@192.168.21.1:mysql-5.0-kt
...
into mysql.com:/home/hf/work/mysql-5.0.19452
2006-08-02 14:17:16 +05:00
grog@eucla.lemis.com
90c9c72605
BUG#13926: --order-by-primary fails if PKEY contains quote character.
...
Quote PKEY.
2006-08-02 11:26:08 +09:30
grog@eucla.lemis.com
8597ebaed0
mysqldump.c:
...
Tidy up style: no space before = or +=.
2006-08-02 10:48:47 +09:30
msvensson@neptunus.(none)
31be565d2e
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-01 20:24:30 +02:00
gkodinov/kgeorge@macbook.gmz
7b5e4ed026
Bug #20103 : Escaping with backslash does not work
...
- make the client to respect the server-side
no_backslash_escapes option and disable the
special meaning of backslash also at client side.
2006-08-01 11:05:54 +03:00
igreenhoe/greenman@anubis.greendragongames.com
940db2e976
Merge anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/mysql-4.1-maint
...
into anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-19364
2006-07-31 12:53:47 -07:00
msvensson@neptunus.(none)
5f78c492ec
Merge 192.168.0.20:mysql/bug21217/my50-bug21217
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-31 14:42:06 +02:00
msvensson@neptunus.(none)
dce84a7e05
Merge 192.168.0.20:mysql/bug21217/my41-bug21217
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-07-31 14:41:29 +02:00
msvensson@neptunus.(none)
2461e48698
Bug#21042 mysql client segfaults on importing a mysqldump export
...
- Use strmake, that will both protect the buffer and make sure it's terminated by a zero
- Add test case
2006-07-31 14:22:32 +02:00
msvensson@shellback.(none)
5a710e8613
Merge shellback.(none):/home/msvensson/mysql/bug21217/my41-bug21217
...
into shellback.(none):/home/msvensson/mysql/bug21217/my50-bug21217
2006-07-30 19:33:48 +02:00
msvensson@shellback.(none)
eaae3b2d2b
BUG#21217 "mysqltest" client is inconsistent when to log a line number
...
- Init start_lineno to 0
2006-07-30 19:30:20 +02:00
msvensson@neptunus.(none)
155bf26d61
Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21042
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-27 12:31:50 +02:00
msvensson@neptunus.(none)
b3bbb3789e
Bug#21042 mysql client segfaults on importing a mysqldump export
...
- Use strxnmov to protect the "buff" variable from overrun
2006-07-27 12:28:49 +02:00
msvensson@neptunus.(none)
2bb5f5662f
Bug#19890 mysqltest: "query" command is broken
...
- Allow "query" to be used as a prefix for focing a command to be sent to server
- Add testcases
2006-07-26 14:02:24 +02:00
jimw@rama.(none)
8489a8db07
Bug #16502 : mysqlcheck gets confused with views
...
Make mysqlcheck skip over views when processing all of the tables in a
database.
2006-07-24 13:31:20 -07:00
msvensson@neptunus.(none)
e6b324097b
Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug19745
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-24 16:36:13 +02:00
rburnett@bk-internal.mysql.com
fe7c252078
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-07-24 16:25:20 +02:00
msvensson@neptunus.(none)
c84cdbf40b
Bug#21215 mysqldump creating incomplete backups without warning
...
- Add call to 'safe_exit' function when db query fails.
2006-07-24 13:10:24 +02:00
kostja@bodhi.local
2ce1a07c89
A fix and a test case for Bug#15752 "Lost connection to MySQL server
...
when calling a SP from C API"
The bug was caused by lack of checks for misuse in mysql_real_query.
A stored procedure always returns at least one result, which is the
status of execution of the procedure itself.
This result, or so-called OK packet, is similar to a result
returned by INSERT/UPDATE/CREATE operations: it contains the overall
status of execution, the number of affected rows and the number of
warnings. The client test program attached to the bug did not read this
result and ivnoked the next query. In turn, libmysql had no check for
such scenario and mysql_real_query was simply trying to send that query
without reading the pending response, thus messing up the communication
protocol.
The fix is to return an error from mysql_real_query when it's called
prior to retrieval of all pending results.
2006-07-24 14:56:53 +04:00
msvensson@neptunus.(none)
9f78d779e3
Don't close connection to mysql before 'safe_exit', that is done in 'safe_exit' if it decides to exit.
2006-07-24 12:48:02 +02:00
msvensson@neptunus.(none)
c2e2ebb1a7
Remove double printout of mysqldump in error message
2006-07-24 12:43:35 +02:00
msvensson@neptunus.(none)
0ab8948c99
Replace sock -> mysql
2006-07-24 12:00:44 +02:00
msvensson@neptunus.(none)
b450438c8b
Change tFlag and dFlag into human readable format
...
tFlag => opt_no_create_info
dFlag => opt_no_data
2006-07-24 11:56:01 +02:00
msvensson@neptunus.(none)
6c12e990b2
Add function verbose_msg
2006-07-24 11:51:52 +02:00
msvensson@neptunus.(none)
3aa99c062f
Bug#10877 mysqldump should use consistent last line
...
- Add printout in write_footer to tell that mysqldump has completed.
Ex: -- Dump completed 2006-07-24 8:55:05
2006-07-24 10:56:33 +02:00
msvensson@neptunus.(none)
162e0e0db1
Remove strange comment
2006-07-23 22:13:12 +02:00
jimw@rama.(none)
dc0f4a21e6
Bug #19147 : mysqlshow INFORMATION_SCHEMA does not work
...
When a wildcard database name is given the mysqlshow, but that wildcard
matches one database *exactly* (it contains the wildcard character), we
list the contents of that database instead of just listing the database
name as matching the wildcard. Probably the most common instance of users
encountering this behavior would be with "mysqlshow information_schema".
2006-07-21 20:29:25 -07:00
holyfoot/hf@mysql.com/deer.(none)
1f064174a4
bug #20950 (mysql_upgrade looks for 'mysqlcheck' not for 'mysqlcheck.exe'
...
on Windows.
Code added to look for different names on Windows
2006-07-21 17:02:04 +05:00
msvensson@neptunus.(none)
dbb5a408ea
Bug#15690 mysqlimport tries to set options the server doesn't understand
...
- "set @@character_set_database" should be ignored by servers prior to 4.1.1
2006-07-20 17:30:44 +02:00
iggy@rolltop.ignatz42.dyndns.org
2835ebdf63
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_bug20328
2006-07-19 17:00:39 -04:00
cmiller@zippy.cornsilk.net
34256fb8f5
Bug #14448 : delimiter in 'prompt'
...
"I want to have the current delimiter in the prompt so that I can know at
a glance which is set."
Add a 'l' format specifier that represents the current statement delimiter.
2006-07-19 14:33:56 -04:00
tnurnberg@salvation.intern.azundris.com
199bb148fd
Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-release
...
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-merge
2006-07-19 14:12:30 +02:00
iggy@rolltop.ignatz42.dyndns.org
ad12809f35
Bug# 20221- Dumping of multiple databases containing view(s) yields maleformed dumps.
2006-07-17 18:07:08 -04:00
jimw@rama.(none)
3fb0f420ac
Merge bk-internal:/home/bk/mysql-5.0-kt
...
into rama.(none):/home/jimw/my/mysql-5.0-17485
2006-07-17 12:55:36 -07:00
igreenhoe/greenman@anubis.greendragongames.com
9beb95f0ed
Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/merge-4.1_2_5.0
2006-07-14 06:52:25 -07:00
tnurnberg@mysql.com/salvation.intern.azundris.com
00ec3973f7
Bug#21014: Segmentation fault of mysqldump on view
...
mysqldump did not select the correct database before trying to dump
views from it. this resulted in an empty result set, which in turn
startled mysql-dump into a core-dump. this only happened for views,
not for tables, and was only visible with multiple databases that
weren't by sheer luck in the order mysqldump required, anyway. this
fixes by selecting the correct database before dumping views; it also
catches the empty set-condition if it should occur for other reasons.
2006-07-14 12:50:00 +02:00
igreenhoe/greenman@anubis.greendragongames.com
abb75129f8
4.1 -> 5.0 merge
2006-07-13 16:35:25 -07:00
tnurnberg@mysql.com/salvation.intern.azundris.com
7350cb8b5e
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/tnurnberg/work/mysql-5.0-21014
2006-07-14 01:26:19 +02:00
tnurnberg@mysql.com/salvation.intern.azundris.com
4316f715d3
Bug#21014: Segmentation fault of mysqldump on view
...
mysqldump did not select the correct database before trying to dump
views from it. this resulted in an empty result set, which in turn
startled mysql-dump into a core-dump. this only happened for views,
not for tables, and was only visible with multiple databases that
weren't by sheer luck in the order mysqldump required, anyway. this
fixes by selecting the correct database before dumping views; it also
catches the empty set-condition if it should occur for other reasons.
2006-07-14 01:25:13 +02:00
igreenhoe/greenman@anubis.greendragongames.com
8e3d69d986
Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-15977
2006-07-13 00:33:49 -07:00
igreenhoe/greenman@anubis.greendragongames.com
a5b8596c37
Fix for Bug #19364 "mysql --help gives old informations".
...
Old option ordering in the help was confusing to some users. Changed
ordering of deprecated options to be consistent, and added mention to
entry for options with a "--no-option" variant mentioning the
"--disable-option" variant.
2006-07-13 00:31:47 -07:00
tnurnberg@mysql.com/salvation.intern.azundris.com
4be51e1644
Bug#20432: mysql client interprets commands in comments
...
do not look for client-specific commands while inside a multi-line comment.
we will allow multi-comments pretty much anywhere within SQL-statements,
but client-specific commands (help, use, print, ...) must be the first token
in the input.
2006-07-13 09:04:06 +02:00
jimw@rama.(none)
9a2a3c6edf
Bug #17485 : mysql client crashes when connecting to the Instance Manager
...
Using \U or \u in a prompt with the mysql command-line client could
crash when connecting to the instance manager, since it does not return
information about the user when asked by the client. This is fixed by
having the client use what it knowns about the user (or giving up and
saying "(unknown)").
2006-07-11 12:42:03 -07:00
bar@mysql.com
c86acb53fa
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b10979
2006-07-07 12:14:12 +05:00
holyfoot@deer.(none)
bfdc0cdcff
bug #19452 (mysql_upgrade reads [client] section but doesn't handle [host] option
2006-07-03 14:22:39 +05:00
iggy@mysql.com
f6658356c6
Bug#20328 mysql client: dumb about trailing spaces on help command.
2006-06-29 17:06:28 -04:00
tnurnberg@mysql.com
d5ff4f6882
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/tnurnberg/mysql-5.0-maint-18462
2006-06-26 16:15:41 +02:00
igreenhoe@mysql.com
85d130c58b
Fix for bug #15977 (switch ordering of DISABLE KEYS/LOCK TABLE in mysqldump)
2006-06-21 00:12:23 -07:00
cmiller@zippy.(none)
deca07bdcc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
2006-06-20 17:17:04 -04:00
cmiller@bk-internal.mysql.com
b0ebd2fce0
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-maint
2006-06-19 14:38:57 +02:00
lars@mysql.com
5937422a53
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-19 12:09:24 +02:00
tnurnberg@mysql.com
2b613e4ce7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/mysql-5.0-maint-17371
2006-06-12 02:46:26 +02:00
igor@rurik.mysql.com
950a000503
Fixed some problems for Windows build
2006-06-06 09:59:45 -07:00
anjuta@arthur.local
bd8eef5647
BUG#19363: mysql --no_pager makes core dump.
...
The problem was missing break; operator.
2006-06-02 22:03:39 +03:00
tnurnberg@mysql.com
a717c68739
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/mysql-5.0-maint-18462
2006-06-01 07:11:00 +02:00
msvensson@shellback.(none)
c542aa8701
Merge shellback.(none):/home/msvensson/mysql/bug19575/my50-bug19575
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-05-31 16:32:08 +02:00
msvensson@shellback.(none)
fe0e91d501
Bug#20022 mysql-test-run can't be run with secure connections turned on for all testcases
...
- Part 1, fixes rpl- and federated-tests where connection is made to 127.0.0.1
2006-05-31 16:28:03 +02:00
msvensson@shellback.(none)
20217ba36f
Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init
...
- Include prefix files that renames all public functions in yaSSLs
OpenSSL API to ya<function_name>. They will otherwise conflict
with OpenSSL functions if loaded by an application that uses OpenSSL
as well as libmysqlclient with yaSSL support.
2006-05-31 16:19:06 +02:00
tnurnberg@mysql.com
8c24373668
Bug#18462: mysqldump does not dump view structures correctly
...
(The above problem only occurs with -T -- create a separate file for
each table / view.) This ChangeSet results in correct output of view-
information while omitting the information for the view's stand-in
table. The rationale is that with -T, the user is likely interested
in transferring part of a database, not the db in its entirety (that
would be difficult as replay order is obscure, the files being named
for the table/view they contain rather than getting a sequence number).
2006-05-31 13:36:28 +02:00
tnurnberg@mysql.com
c7ae355d89
Bug#17371: Unable to dump a schema with invalid views
...
'show create' works even on views that are short of a base-table (this
throw a warning though, like you would expect). Unfortunately, this is
not what mysqldump uses; it creates stand-in tables and hence requests
'show fields' on the view which fails with missing base-tables. The
--force option prevents the dump from stopping at this point; furthermore
this patch dumps a comment showing create for the offending view for
better diagnostics. This solution was confirmed by submitter as solving
their/clients' problem. Problem might become non-issue once mysqldump no
longer creates stand-in tables.
2006-05-30 14:49:05 +02:00
ramil@mysql.com
4df24774c1
Merge mysql.com:/usr/home/ram/work/mysql-4.1
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2006-05-30 13:16:11 +05:00
ramil@mysql.com
8436973fda
after merge fix.
2006-05-29 12:32:08 +05:00
ramil@mysql.com
6b2ab800c9
manual merge
2006-05-29 11:17:38 +05:00
grog@mysql.com
1f86b3f100
BUG#17201: Improve handling of views.
2006-05-25 17:30:28 +09:30
bar@mysql.com
1579af9578
bug#10979 USE does not refresh db privilege changes if the same db is used in command.
...
The problem happened because "mysql" didn't send mysql_select_db() if
the current active database was specified in USE.
Now it always send mysql_select_db().
Rebuilding of completion hash is skipped in the same db is used
(for performance purposes).
2006-05-24 16:10:25 +05:00
ramil@production.mysql.com
31eadde21a
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into production.mysql.com:/usersnfs/rkalimullin/4.1.b18351
2006-05-24 10:08:26 +02:00
ramil@mysql.com
13baf7575f
Fix for bug #18536 : mysqldump does not maintain table orders as per --tables option
2006-05-19 16:21:32 +05:00
knielsen@mysql.com
b6ee2d2340
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix
...
into mysql.com:/usr/local/mysql/tmp-5.0
2006-05-15 19:57:12 +02:00
knielsen@mysql.com
fc16aff742
Fix two Valgrind memory leak warnings.
2006-05-15 18:07:18 +02:00
cmiller@zippy.(none)
d24b4d6e99
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
2006-05-11 09:14:09 -04:00
cmiller@zippy.(none)
18754b0a97
Bug#19564: mysql displays NULL instead of space
...
Correct a bug (that I introduced, after using Oracle's database software for
too many years) where the length of the database-sent data is incorrectly
used to infer NULLness.
2006-05-09 22:35:51 -04:00
msvensson@neptunus.(none)
a15415cc04
BUG#16803 "ln -s /dev/null .mysql_history" doesn't work!
...
- Add a check to see if the .mysql_history file a symlink to /dev/null
and in such case, skip reading and writing to it.
2006-05-09 11:01:50 +02:00
msvensson@neptunus.(none)
27c64c715f
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-09 08:26:25 +02:00
ramil@mysql.com
b698a07b1f
Fix for bug #18351 : mysqlbinlog does not set default charset?
2006-05-04 15:34:20 +05:00
msvensson@neptunus.(none)
7c8c14c435
Move "max-connect-retries" option to get alpabetichal order
2006-05-03 15:53:59 +02:00
msvensson@neptunus.(none)
5563a2f32f
Add support for specifyihng the number of reconnec retries oin the command line
2006-05-03 14:04:54 +02:00
holyfoot@mysql.com
aaf2c26e01
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.clean
2006-05-02 09:01:13 +05:00
holyfoot@deer.(none)
aab0e9c24e
Win build fix
2006-05-02 08:59:49 +05:00
jimw@mysql.com
c571f6ff57
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-05-01 10:59:14 -07:00
holyfoot@deer.(none)
9b832153f9
Fix for Win build
2006-05-01 22:16:08 +05:00
jimw@mysql.com
9ab852bb35
Merge mysql.com:/home/jimw/my/mysql-5.0-18312
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-05-01 09:11:57 -07:00
msvensson@neptunus.(none)
cccc2c4b6a
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-28 08:33:42 +02:00
holyfoot@mysql.com
059e2f7005
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.upgd
2006-04-28 09:19:53 +05:00
holyfoot@deer.(none)
5a75f865c2
bug #18115 (mysql_upgrade on Windows)
...
pushed in 5.0
2006-04-28 09:07:25 +05:00
msvensson@shellback.(none)
e5004d1312
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-27 17:35:29 +02:00
msvensson@neptunus.(none)
31db4898c3
Merge neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-26 22:24:25 +02:00
msvensson@neptunus.(none)
29ace143a1
Backport fix for mysql client not using SSl library directly
...
- Add function mysql_get_ssl_cipher
- Use function mysql_get_ssl_cipher from mysql
2006-04-22 00:48:13 +02:00
kent@mysql.com
1472ed2061
Merge
2006-04-21 20:04:13 +02:00
jimw@mysql.com
c28ea5b03b
Bug #18312 : mysqltest: --sleep=0 doesn't disable sleep
...
Allow --sleep=0 to be specified to mysqltest, so that sleep calls
can be disabled.
Original patch from Paul DuBois.
2006-04-21 10:48:53 -07:00
msvensson@neptunus.(none)
a51668c74c
Bug#17208 SSL: client does not verify server certificate
...
- Add new function 'ssl_verify_server_cert' which is used if we are
connecting to the server with SSL. It will compare the hostname in
the server's cert against the hostname that we used when connecting
to the server. Will reject the connection if hostname does not match.
- Add new option "OPT_SSL_VERIFY_SERVER_CERT" to be passed to mysql_options
which will turn on checking of servers cert.
- Add new argument "ssl-verify-server-cert" to all mysql* clients which
will activate the above option.
- Generate a new server cert with 1024 bits that has "localhost" as the server name.
2006-04-18 17:58:27 +02:00
serg@mysql.com
98ea03931e
mysql.cc:
...
revert bug#16855 "fix" per Monty's request
2006-04-18 10:16:06 +02:00
bar@mysql.com
aa8ab68fea
Bug#17939: Wrong table format when using UTF8 strings
...
Lines with column names consisting of national letters
were wrongly formatted in "mysql --table" results:
mysql> SELECT 'xxx xxx xxx' as 'xxx xxx xxx';
+-------------------+
| xxx xxx xxx |
+-------------------+
| xxx xxx xxx |
+-------------------+
1 row in set (0.00 sec)
It happened because in UTF-8 (and other multibyte charsets)
the number of display cells is not always equal to the number
of bytes of the string.
Data lines (unlike column name lines) were formatted correctly,
because data lines were displayed taking in account number of
display cells. This patch takes in account number of cells when
displaying column names, the same way like displaying data lines does.
Note: The patch is going to be applied to 4.1.
Test case will be added after merge to 5.0,
into "mysql.test", which appeared in 5.0.
mysql.cc:
Adding column name allignment using numcells(),
the same to data alignment, which was implemented earlier.
2006-04-17 12:33:45 +05:00
cmiller@zippy.(none)
7d282984f3
Only expand the empty string to the letters "NULL" if the column
...
does not have "NOT NULL" attribute set. Also, calculate the padding
characters more safely, so that a negative number doesn't cause it to
print MAXINT-n spaces.
2006-04-16 17:17:36 -04:00
cmiller@zippy.(none)
a1e78b3d36
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
2006-04-11 16:39:09 -04:00
msvensson@neptunus.(none)
0d98d97170
Remove #if 0
2006-04-07 14:21:00 +02:00
msvensson@neptunus.(none)
1452892816
Incorporate a patch to write a timestamp for every new line of the test that is executed.
...
This makes it possible make a graph (with for example gnuplot) of a test run and spot where most time is consumed.
Add the new code inside an "#if 0" until it's portable.
2006-04-05 11:47:12 +02:00
cmiller@zippy.(none)
0db6176bfc
Bug#18265: mysql client: No longer right-justifies numeric columns
...
Also fixes a new bug for which "NULL" wasn't printed (because the
data it represents has length zero). (Discovered my Paul DuBois.)
2006-04-04 17:35:07 -04:00
ian@zim.(none)
a66aace3e9
Fix for bug #16855
2006-03-27 17:45:06 -08:00
msvensson@shellback.(none)
8f1ed3c463
Dump result to .log file at test failure
2006-03-23 21:48:31 +01:00
msvensson@shellback.(none)
4602e426dc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-23 18:58:53 +01:00
msvensson@shellback.(none)
5ebda1d2f6
Update after merge, function renamed
2006-03-23 16:21:20 +01:00
msvensson@shellback.(none)
e6bf664c62
Merge shellback.(none):/home/msvensson/mysql/mysqltestrun_pl/my50-mysqltestrun_pl
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-23 15:30:21 +01:00
msvensson@shellback.(none)
5ec7aa3aaf
Dump reject file before mysqltest in 'die'
...
Makes it easier to see what happened before the failure
2006-03-23 15:04:46 +01:00
msvensson@neptunus.(none)
0811648e31
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
2006-03-20 21:35:05 +01:00
anozdrin@mysql.com
41423cd05c
Fix version of DEFINER-clause in mysqldump.
...
Now DEFINER-clause in stored routines is expected to appear
in 5.0.20 release, not in 5.0.19. as it was supposed before.
2006-03-10 22:23:04 +03:00
msvensson@neptunus.(none)
31804060aa
Improve mysqltest
...
Add comment's for enable/disable_query_log and enable/disable_result_log
Update comment for "check_result"
Add check in "handle_error" that detects if the server crashed when running a "require" query to check if a certain feature is available
2006-03-10 12:08:53 +01:00
anozdrin@mysql.com
d5e641fec7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt
2006-03-07 21:47:41 +03:00
msvensson@neptunus.(none)
48bef14042
Fix missing call to init_tmp_sh_file
2006-03-07 14:34:20 +01:00
anozdrin@mysql.com
d9d4dc5ef8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt
2006-03-07 14:28:09 +03:00
msvensson@neptunus.(none)
647a940649
Enable ifdef for windows specific functions
2006-03-07 08:57:57 +01:00
msvensson@neptunus.(none)
456b2d6b14
Improve error message for faulty usage of "inc" and "dec"
2006-03-07 07:50:04 +01:00
msvensson@neptunus.(none)
f2ce7dc787
Fix typo
2006-03-06 22:18:04 +01:00
msvensson@neptunus.(none)
0cc14310e8
Remove unused var
...
Reduce code
2006-03-06 22:08:34 +01:00
msvensson@neptunus.(none)
a336f48552
Win fixes
...
- Use tmp sh file both in system and popen
2006-03-06 22:05:39 +01:00
msvensson@neptunus.(none)
3f935b2777
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 12:00:51 +01:00
dlenev@mysql.com
0fb4a6645e
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg17866-2
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2006-03-04 23:58:48 +03:00
cmiller@zippy.(none)
599c710a5b
Bug#16859 involves truncating column data at NUL characters. Instead, the
...
client will now substitute spaces for NULs, so that the grid isn't messed up
due to silently consumed NULs and that the full field is shown.
2006-03-03 16:26:38 -05:00
paul@snake-hub.snake.net
1442be9798
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-clone
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
2006-03-03 14:37:43 -06:00
paul@snake-hub.snake.net
f3cf52832d
mysqltest.c:
...
Typos.
2006-03-03 14:34:30 -06:00
paul@snake-hub.snake.net
f3c7e2d3ed
mysqltest.c:
...
Better fix for do_sleep().
2006-03-03 13:57:49 -06:00
msvensson@neptunus.(none)
21cc7c9555
Windows fixes
...
- Use pipes "|"
- Improved system command, create a temporary .sh faile that is executed with cygwins sh(bash)
This makes the Windows version behave exactly as the Lunix version(well almost...)
- Give unix path to DBUG, trace files is no produced if running ./mysql-test-run.pl --debug"
2006-03-03 14:55:05 +01:00
msvensson@neptunus.(none)
f601d26961
Remove superfluous DBUG_PRINT
2006-03-02 17:33:34 +01:00
msvensson@neptunus.(none)
52d51e5e26
Make the "system" command become executed in a bash shell in cygwin.
2006-03-02 16:28:45 +01:00
anozdrin@mysql.com
fbb5920399
Implementation of WL#2897: Complete definer support in the stored routines.
...
The idea is to add DEFINER-clause in CREATE PROCEDURE and CREATE FUNCTION
statements. Almost all support of definer in stored routines had been already
done before this patch.
NOTE: this patch changes behaviour of dumping stored routines in mysqldump.
Before this patch, mysqldump did not dump DEFINER-clause for stored routines
and this was documented behaviour. In order to get full information about stored
routines, one should have dumped mysql.proc table. This patch changes this
behaviour, so that DEFINER-clause is dumped.
Since DEFINER-clause is not supported in CREATE PROCEDURE | FUNCTION statements
before this patch, the clause is covered by additional version-specific comments.
2006-03-02 15:18:49 +03:00
msvensson@neptunus.(none)
e4b6f64a16
Make do_block return void, return value never used.
2006-03-02 11:10:29 +01:00
msvensson@neptunus.(none)
ff391e9fe1
Fix unsigned warning on windows
2006-03-02 11:08:43 +01:00
paul@snake-hub.snake.net
67e4580e29
mysqltest.c:
...
expand tab
2006-02-28 15:11:44 -06:00
paul@snake-hub.snake.net
d8a6e41c6b
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 15:09:45 -06:00
paul@snake-hub.snake.net
d6654fe9cb
mysql-test-run.sh:
...
Fix URLs.
README:
Fix URL.
mysqltest.result:
Update test result for real_sleep error message.
mysqltest.c:
Fix do_sleep() to print correct command name for real_sleep.
2006-02-28 15:08:16 -06:00
paul@snake-hub.snake.net
7ff2ede8c9
mysqltest.c:
...
Fix reference to incorrect (non-existent) options in comment.
2006-02-28 14:04:21 -06:00
paul@snake-hub.snake.net
486bd42b06
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 14:01:16 -06:00
paul@snake-hub.snake.net
fc8ed82da4
mysqltest.c:
...
Correct/clarify comments.
2006-02-28 14:00:17 -06:00
paul@snake-hub.snake.net
a052ef7d82
mysqltest.c:
...
Fix typos.
2006-02-28 12:19:30 -06:00
paul@snake-hub.snake.net
a2c639d813
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 12:10:38 -06:00
paul@snake-hub.snake.net
6d4dc91bbf
mysqltest.c:
...
Fix typos.
2006-02-28 12:01:24 -06:00
msvensson@neptunus.(none)
90e5ca96be
Look for and "convert" paths that start with $MYSQL_TMP_DIR
2006-02-26 19:54:09 +01:00
paul@snake-hub.snake.net
b11c033f49
mysqltest.c:
...
Rearrange out of order options in option struct.
2006-02-23 13:54:55 -06:00
msvensson@neptunus.(none)
36a1d6392b
Change snprintf to my_snprintf
2006-02-23 16:08:28 +01:00
msvensson@neptunus.(none)
269ab365aa
Aix52 build fix
2006-02-23 14:06:29 +01:00
msvensson@neptunus.(none)
5c4bf37259
Merge fixup
2006-02-23 10:35:53 +01:00
msvensson@neptunus.(none)
f80555880a
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-23 10:30:31 +01:00
msvensson@neptunus.(none)
ec91a79c9f
Add new parameter to do_eval so that only unescaped variables in input string is expanded and rest of string is left untouched.
2006-02-23 10:11:57 +01:00
msvensson@neptunus.(none)
a699a2ea1b
Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 15:05:58 +01:00
msvensson@neptunus.(none)
c293324eb0
Bug#14871 mysqldump: invalid view dump output
...
- Add comments with embeded veriosn info around the parts of the view syntax that are only supported by a certain version of MySQL Server
2006-02-21 13:21:17 +01:00
msvensson@neptunus.(none)
40fe710394
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 09:40:18 +01:00
msvensson@neptunus.(none)
6006c9ac36
Merge neptunus.(none):/home/msvensson/mysql/bug13809/my50-bug13809
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 09:11:03 +01:00
msvensson@neptunus.(none)
3764d3dab1
Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 08:55:13 +01:00
msvensson@neptunus.(none)
ae174fbef8
Fix typo
2006-02-20 12:05:45 +01:00
paul@snake-hub.snake.net
22f630f59a
mysqlcheck.c:
...
Tweak --check-upgrade help text.
2006-02-17 08:32:52 -06:00
msvensson@neptunus.(none)
b951068d62
Replace win filename s with unix equivalent
...
Evaluate commands passed to "exec" and "system" to expand any $variables before executing command.
2006-02-17 12:07:45 +01:00
holyfoot@deer.(none)
053d90a234
WL#2645 (CHECK TABLE FOR UPGRADE)
...
necessary implementation in the server
mysql_upgrade script added
2006-02-17 10:52:32 +04:00
paul@snake-hub.snake.net
a9cda1edd3
mysqlcheck.c:
...
Fix out of order options.
2006-02-16 10:00:14 -06:00
msvensson@neptunus.(none)
3fc22ca4b9
Bug#13809 mysql-test: --replace_result option works on Windows incorrect
2006-02-16 00:53:55 +01:00
msvensson@neptunus.(none)
cac0931b8c
Add possibility to have a negative expression in "if" and "while" in mysqltest
2006-02-15 22:43:42 +01:00
jimw@mysql.com
e75a62aeae
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2006-02-15 07:36:33 -08:00
msvensson@neptunus.(none)
56ef2e28e4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-15 12:02:20 +01:00
jimw@mysql.com
d70c47b2a9
Merge mysql.com:/home/jimw/my/mysql-4.1-16389
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2006-02-14 18:12:30 -08:00
msvensson@neptunus.(none)
fed5a68ea8
Merge neptunus.(none):/home/msvensson/mysql/bug17280/my50-bug17280
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-14 15:34:30 +01:00
msvensson@neptunus.(none)
e486d81a52
Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-13 10:56:45 +01:00
msvensson@neptunus.(none)
5000951ab4
Bug#14013 mysql_stmt_store_result() bombs if a cursor is open
...
- Add code to 'mysql_stmt_store_result' to allow it to be called on
a prepared statement with open server side cursor.
- Add tests to mysql_client_test that uses 'mysql_stmt_store_result'
2006-02-10 14:50:29 +01:00
aelkin@mysql.com
14ced05e55
BUG#16217 fix partly backported from 5.0. It is different in mysqlbinlog part.
...
This changeset is assumed to stay in 4.1.
2006-02-10 15:12:27 +02:00
msvensson@neptunus.(none)
4217699e56
Bug#17280 mysqltest, --echo sometimes does not expand $variables
...
- Evaluate all variables in the text before printing it to result file
2006-02-10 12:11:16 +01:00
aelkin@mysql.com
dd2a44c497
BUG#16217 forced to introduce a separate mysql client command to adopt its
...
internal charset to one associated with currently being handled query.
To note such a query can come from interactive client either.
There was a discussion within replication team and Monty who's suggestion won.
It avoids straightforward parsing of all `set' queries that could affect client side
character set.
According to the idea, mysql client does not parse `set' queries but rather cares of
`charset new_cs_name' command.
This command is generated by mysqlbinlog in form of exclaiming comment (Lars' suggestion)
so that enlightened clients like `mysql' knows what to do with it.
Interactive human can switch between many multi-byte charsets during the session
providing the command explicitly.
To note that setting new internal mysql's charset does not
trigger sending any `SET' sql statement to the server.
2006-02-09 16:23:09 +02:00
msvensson@neptunus.(none)
c9b7317ff9
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-02 11:47:01 +01:00
msvensson@neptunus.(none)
01ddf96930
Convert exponent results for MYSQL_TYPE_FLOAT on Windows
2006-02-02 11:45:37 +01:00
jimw@mysql.com
970aa54bd6
Fix mysqldump crash when encountering a VIEW (when used against a
...
5.0 or later server, obviously). (Bug #16389 )
2006-02-01 12:28:39 -08:00
msvensson@neptunus.(none)
df5a947ba7
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-01 15:02:36 +01:00
msvensson@neptunus.(none)
102aa5a79f
Use common function 'append_field' to output the value of one field to the result.
...
Fix for extra zero in exponent of double values on windows.
2006-02-01 11:36:32 +01:00
msvensson@neptunus.(none)
b758b690a1
Bug #15302 LOAD DATA FROM MASTER -> Packets out of order (Found: 2, expected 1)
...
- Change "mysql_create_db" to not call "send_ok" if in silent mode i.e. called from "load_master_data"
- Change mysqltest to detect when there aren't as many warnings available as was reported.
2006-01-31 12:47:22 +01:00
serg@serg.mylan
87f685edef
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-17 21:12:24 +01:00
msvensson@neptunus.(none)
8b243b3799
Fix for connection not being added to connection pool if "disable_abort_on_error" was used.
2006-01-17 19:02:42 +01:00
serg@serg.mylan
ae3d815b41
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-16 18:09:04 +01:00
msvensson@neptunus.(none)
4b913614fc
Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-11 11:24:57 +01:00
msvensson@neptunus.(none)
f60f757689
Add comments that groups and describes the inits
2006-01-11 11:10:58 +01:00
msvensson@neptunus.(none)
f4ad824df9
Remove obsolete comment
2006-01-11 11:07:17 +01:00
msvensson@neptunus.(none)
2f48e4f1dc
Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.
2006-01-11 11:06:26 +01:00
msvensson@neptunus.(none)
d42d399464
Disable code for "let" to assign each column from query to it's own variable
2006-01-11 00:24:57 +01:00
anozdrin@mysql.com
b04b851ef9
Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
...
There are two main idea of this fix:
- introduce a common function for server and client to split user value
(<user name>@<host name>) into user name and host name parts;
- dump DEFINER clause in correct format in mysqldump.
2006-01-11 02:07:40 +03:00
msvensson@neptunus.(none)
a09473e652
Fix for crashing mysqltest
2006-01-10 15:56:30 +01:00
msvensson@neptunus.(none)
e0d3410a3e
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2006-01-09 20:12:18 +01:00
serg@serg.mylan
30c09d6dc0
merged
2006-01-03 18:12:03 +01:00
serg@serg.mylan
14f94dc0ca
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
msvensson@neptunus.(none)
43a559ac70
Improved error message for failing with wrong error
2005-12-29 09:48:43 +01:00
stewart@mysql.com
efbdf7b225
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-12-28 00:57:18 +11:00
paul@snake-hub.snake.net
f5cc3fd619
mysql.cc:
...
Typo in help message.
2005-12-20 12:47:44 -06:00
msvensson@neptunus.(none)
94d05ebc37
Avoid implicit commits by using a different connection when creating/dropping sp's and views.
2005-12-20 17:06:20 +01:00
msvensson@neptunus.(none)
90bbcc9b4d
Store the each column from a multi column result set into a separate variable.
2005-12-20 15:34:58 +01:00
msvensson@neptunus.(none)
b38a183d62
Remove confusing printouts from expected to fail "system" commands
2005-12-13 18:47:34 +01:00
msvensson@neptunus.(none)
b5d805b2d6
Remove confusing printout
2005-12-13 18:10:53 +01:00
msvensson@neptunus.(none)
36c86a4df6
Fix tests after merge
...
Straighten out and comment behaviour for --require and --result in run_query
2005-12-13 18:07:13 +01:00
paul@snake-hub.snake.net
c708d9140f
mysqltest.c:
...
Put options in proper order.
2005-12-12 12:15:25 -06:00
msvensson@neptunus.(none)
4bcb012bbc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2005-12-12 12:43:33 +01:00
msvensson@neptunus.(none)
8aeb3a1fba
Fix warnings for running with --view_protocol
2005-12-09 18:51:45 +01:00
msvensson@neptunus.(none)
fe2ec19039
WL#2930 mysqltest++
...
- Updated after valgrinding
2005-12-08 16:48:37 +01:00
msvensson@neptunus.(none)
d80516aa96
Fix memory leak
2005-12-07 14:52:37 +01:00
msvensson@neptunus.(none)
600a74b0d4
WL#2930
...
- Updated after review
2005-12-06 21:28:13 +01:00
knielsen@mysql.com
17cab43fcf
Bug#15097: Missing \n in header printed by mysql --help when HAVE_READLINE
...
is not defined.
2005-12-05 12:12:08 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
d88d8081da
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-12-04 15:34:47 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
669a12fdb0
A set of Netware related patches.
2005-12-04 15:02:06 +02:00
jimw@mysql.com
beed6147ad
Merge mysql.com:/home/jimw/my/mysql-4.1-13318
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-01 12:21:29 -08:00
jimw@mysql.com
5f7e5b46c6
Merge mysql.com:/home/jimw/my/mysql-4.1-5792
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-28 10:52:52 -08:00
jimw@mysql.com
000d89b5e0
Fix values printed by mysqldump for empty blob fields when
...
--hex-blob is used. (Bug #13318 )
2005-11-23 17:31:44 -08:00
bell@sanja.is.com.ua
db8f03ebe8
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
2005-11-23 01:28:32 +02:00
bell@sanja.is.com.ua
7bd691f11e
Recursion support made for SP (BUG#10100).
2005-11-23 01:11:19 +02:00
kent@mysql.com
9b14ee2ebc
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
2005-11-22 01:17:06 +01:00
joerg@mysql.com
84bc725fb9
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-11-21 18:31:36 +01:00
joerg@mysql.com
b3b124f9e4
Merge the last 5.0.16 (Unix, Windows) and 5.0.16a (Netware) changes to the general tree.
2005-11-21 15:49:34 +01:00
aivanov@mysql.com
9a7efe36c6
Fixed BUG #14554 : mysqldump does not separate "ROW" and trigger
...
statement for tables created in the IGNORE_SPACE sql mode.
2005-11-21 13:36:48 +03:00
kent@mysql.com
bcdd552d6e
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
2005-11-19 11:20:52 +01:00
kent@mysql.com
bd80dc6c2e
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-19 11:11:09 +01:00
jamppa@suse9-x86.mysql.com
a50cc250ff
Netware specific changes for 5.0.16a
2005-11-18 18:25:46 +01:00
jimw@mysql.com
f8ce7bc01e
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-17 13:37:30 -08:00
jimw@mysql.com
2ffc7ff2a2
Update out-of-date URLs in 'help' text of mysql client. (Bug #14801 )
2005-11-11 15:23:04 -08:00
kent@mysql.com
b269caecb1
Additional "make distcheck" changes specific to 5.0
2005-11-09 11:56:04 +02:00
msvensson@neptunus.(none)
a6031b6425
Formatting improved
2005-11-04 12:15:49 +01:00
msvensson@neptunus.(none)
4f26b44318
Remove trailing whitespace
2005-11-04 12:00:34 +01:00
kent@mysql.com
4742f585b1
Merge
2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-04 01:15:35 +01:00
msvensson@neptunus.(none)
39b2fb2b3c
Reapplying patch
...
Check for NULLs only if we don't replace column results,
get real results after all checks.
(see bug #14254 : func_crypt.test fails on FreeBSD with --ps-protocol).
Remove two FIXME's
2005-11-03 19:32:19 +01:00
msvensson@neptunus.(none)
32f6ece388
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930
2005-11-03 19:20:47 +01:00
msvensson@neptunus.(none)
718839a1c1
WL#2930 Adding view and cursor 'protocols' to mysqltest
...
- Part2, actually adding the new functionality
2005-11-03 19:00:37 +01:00
tim@siva.hindu.god
198ead8f4e
merge
2005-11-02 08:46:13 +13:00
evgen@moonbone.local
bbe58c7e26
Manually merged
2005-11-01 19:47:53 +03:00
pem@mysql.com
1137a376a7
Fixed bugs in client/mysqltest.c which made lots of "connect" commands in tests fail.
2005-10-31 19:31:05 +01:00
pem@mysql.com
81437a7286
Removed C++-isms from client/mysqltest.c
2005-10-31 17:51:48 +01:00
msvensson@neptunus.(none)
de07ac0c5a
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930
2005-10-31 13:36:03 +01:00
ramil@mysql.com
afbd0fafd3
Check for NULLs only if we don't replace column results,
...
get real results after all checks.
(see bug #14254 : func_crypt.test fails on FreeBSD with --ps-protocol).
2005-10-31 16:28:45 +04:00
msvensson@neptunus.(none)
e5eb7cbf29
WL#2930 Adding view and cursor 'protocols' to mysqltest
...
- Cleanup of mysqltest.c before extending it
2005-10-31 12:25:08 +01:00
jani@ua141d10.elisa.omakaista.fi
da64397b69
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-31 12:20:54 +02:00
jani@ua141d10.elisa.omakaista.fi
44aea416f9
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-31 11:54:36 +02:00
msvensson@neptunus.(none)
531b847f23
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-31 09:14:58 +01:00
paul@frost.snake.net
19544bd01c
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into frost.snake.net:/Users/paul/bk/mysql-5.0
2005-10-28 14:26:22 -05:00
msvensson@neptunus.(none)
68fa03258a
Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:45:30 +02:00
msvensson@neptunus.(none)
be6f7a3f82
Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:00:54 +02:00
msvensson@neptunus.(none)
22c0d6489c
After reiview fix
...
- Use msg argument to determine if param is required or not in safe_get_param
2005-10-28 10:58:57 +02:00
tim@siva.hindu.god
c704130389
BUG#14358: in mysql.cc, don't neglect to strip delimiter off lines < 9 characters long.
2005-10-28 12:13:34 +13:00
monty@mysql.com
a9b1ff4095
Add DROP TABLE before trying to create view (in mysqldump)
...
Cleaned up xxxx_gis.test's and made gis_generic.inc independent of ndb
(Note that archive_gis.test fails, but this is independent of this patch)
2005-10-27 22:45:18 +03:00
patg@krsna.patg.net
7243b7bb49
BUG# 12123
...
Made change to mysqlimport to set character_set_database to binary to
make importing various charsets/columns work correctly.
2005-10-25 14:50:08 -07:00
paul@frost.snake.net
ea8ab2a114
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into frost.snake.net:/Users/paul/bk/mysql-5.0
2005-10-25 12:50:03 -05:00
pgalbraith@mysql.com
feca138e46
This cset fixes BUG# 12838, 14061, 12129
...
mysqldump.result:
BUG# 12838
New test results for mysqldump -x on a DB with views
mysqldump.test:
sqldump.test:
BUG# 12838
New test to run mysqldump -x on a DB with views
mysqldump.c:
BUG# 12838
Removed/Changed code which created tables to be put into the dump
(For loading views of views) by creating temp tables and then using
the CREATE TABLE information in those temp tables. The problem with this
is that when mysqldump -x is called, it locks all tables, so the
temp tables could not be created, causing the mysqldump to exit with
failure. The code was changed to use SHOW FIELDS to get the column
names and type to build CREATE TABLE text used to create these tables
that views need in the dump.
2005-10-25 19:04:31 +02:00
lars@mysql.com
fbcf26777e
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
2005-10-24 17:23:45 +02:00
paul@frost.snake.net
e1f77e5cc8
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into frost.snake.net:/Users/paul/bk/mysql-5.0
2005-10-21 06:40:52 -05:00
kent@mysql.com
70c816c801
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-20 23:23:33 +02:00
paul@frost.snake.net
5d2c1d4cc2
mysqldump.c:
...
Slight change to help message.
2005-10-19 14:40:10 -05:00
lars@mysql.com
1aae3e1da1
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
2005-10-19 19:42:14 +02:00
lars@mysql.com
4ccb1c6e36
mysqlbinlog --hexdump patch 4:
...
Rename last_event_info to print_event_info to better reflect the new semantics
2005-10-19 19:31:24 +02:00
patg@krsna.patg.net
b310e430f9
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-10-18 18:53:54 -07:00
patg@krsna.patg.net
f1bd9c0d0a
Changeset:
...
Changed option text in mysqldump.c
mysqldump.c:
Changed text to read "+00:00" as opposed to "UTC" (per what the code does)
2005-10-18 18:51:07 -07:00
reggie@ugeek.(none)
600c7df8f1
readd the my_cgets call that SergeyV originally put in
2005-10-18 17:53:09 -05:00
msvensson@neptunus.(none)
0684dc1342
Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking
...
- Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs
to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking.
2005-10-18 15:43:59 +02:00
gluh@eagle.intranet.mysql.r18.ru
7ccf861242
Fix for bug#13783 mysqlcheck tries to optimize and analyze information_schema
...
'information_schema' is excluded from list of databases for mysqlcheck command
2005-10-18 14:25:03 +05:00
patg@krsna.patg.net
1423db9f0c
BUG# 13052 Changed text in options to TIMESTAMP
2005-10-17 12:30:01 -07:00
bar@mysql.com
e7fa41ebf7
mysql.cc:
...
After merge fix.
2005-10-14 14:19:15 +05:00
bar@mysql.com
aec79cc463
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-10-14 14:17:15 +05:00
bar@mysql.com
48238e1b90
Merge mysql.com:/usr/home/bar/mysql-4.1.b13487
...
into mysql.com:/usr/home/bar/mysql-4.1
2005-10-14 14:07:22 +05:00
patg@krsna.patg.net
d86f40650f
BUG# 13146
...
Re-application of patch to clean 5.0 tree. Fixed issue with ANSI quotes
when dumping triggers
2005-10-13 13:42:56 -07:00
jimw@mysql.com
b6dcc55969
Fix being able to set default TCP port for command-line utilities
...
by using MYSQL_TCP_PORT variable. (Bug #5792 )
2005-10-13 12:28:43 -07:00
patg@krsna.patg.net
a46dd41255
BUG# 13052
...
Clean application of patch -
- Added --tz-utc to fix issue of dumping timestamp values between
servers with different global time zone settings, particularly
with regard to the day of DST changeover, which without this fix,
would dump duplicate timestamp values.
2005-10-12 22:44:42 -07:00
lars@mysql.com
082a0bc46c
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
2005-10-12 23:40:54 +02:00
lars@mysql.com
48457e0852
mysqlbin --hexdump patch 3
2005-10-12 23:37:21 +02:00
lars@mysql.com
0378009b5b
Fix of incompatible types
...
len and packet_error needs to be of same type for (len == packet_error) to
check failures
2005-10-12 19:31:24 +02:00
msvensson@neptunus.(none)
7d29c2a4a1
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
2005-10-12 13:59:00 +02:00
msvensson@neptunus.(none)
0ac28d3187
Always test ssl and compress
...
- Updated after review
2005-10-12 13:56:07 +02:00
monty@mysql.com
f5fdf3e87a
Reviewing new pushed code
...
- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
(Some old systems returns ETIME and it's safer to test for both values
than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code
2005-10-12 00:58:22 +03:00
lars@mysql.com
7a94010da9
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
2005-10-11 21:46:40 +02:00
monty@mysql.com
17d7ba931d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-10-08 03:37:23 +03:00
gluh@mysql.com
041eab4663
4.1 -> 5.0 merge
2005-10-07 14:26:32 +05:00
monty@mysql.com
78e828d32f
Review of code pushed since last 5.0 pull:
...
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code
2005-10-06 17:54:43 +03:00
guilhem@mysql.com
8a291efb75
The "exit" command of mysqltest is quite useful when writing tests for 4.1 so I'm porting it from 5.0 to 4.1.
2005-10-05 12:21:53 +02:00
msvensson@neptunus.(none)
cb96f195c8
Improved testing of ssl and compression
...
- Added show status variable "compression" for checking that compression is turned on.
- Updated show status variable "have_openssl" to be set to DISABLED if server supports ssl but it's not turned on to accept incoming ssl connections.
- Setup server to accept ssl connections from clients ig that is supported by server
- New tests
- ssl - Run with ssl turned on
- ssl_compress - Run with ssl and compression turned on
- compress - Run with compression turned in
- Updated test
- openssl_1, rpl_openssl1 - Changed to run if server supports ssl
2005-10-04 15:43:55 +02:00
georg@lmy002.wdf.sap.corp
f846bc32c1
Windows compilation fix: Added typecast (const char* to char *)
2005-10-04 10:54:58 +02:00
kent@mysql.com
fe26e59d70
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-04 04:03:48 +02:00
konstantin@mysql.com
1831d62a5c
Fix -ansi -pedantic compilation failure.
2005-10-03 19:44:53 +04:00
kent@mysql.com
aef1f4cd2e
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-30 22:37:55 +02:00
msvensson@neptunus.(none)
92b1d080c9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
2005-09-30 16:51:35 +02:00
kent@mysql.com
7b2e04d5a2
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-09-30 16:37:02 +02:00
kent@mysql.com
21cf818a8d
Many files:
...
New VC7 project files
des_key_file.cc:
Visual C++ wants '"' for local include
mysql.cc:
Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
Added to convince VS .Net generate a lib for mysqlserver
2005-09-30 14:03:55 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
43b544a968
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
2005-09-30 12:36:23 +03:00
guilhem@mysql.com
fd9a6f9750
Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle.
2005-09-30 10:58:24 +02:00
lars@mysql.com
bf19d02b27
mysqlbinlog --hexdump additional patch 2
...
- Fixes related to Guilhems review
- Special printing of event header
2005-09-30 00:12:14 +02:00
lars@mysql.com
d81d57d408
mysqlbinlog --hexdump augments each log entry with byte information
2005-09-29 10:42:23 +02:00
kent@mysql.com
656b0cc15a
Merge
2005-09-29 03:20:31 +02:00
kent@mysql.com
844d964f2d
Many files:
...
Prefix regex functions/types with "my_" as our
library is not compatible with normal regex lib.
my_regex.h:
Rename: regex/regex.h -> regex/my_regex.h
2005-09-29 02:08:24 +02:00
lenz@mysql.com
6e10a589e1
Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0
2005-09-28 23:05:42 +02:00
lenz@mysql.com
972d85af8b
- compile fix: don't use C++ - style comments in .c files!
2005-09-28 23:04:35 +02:00
bar@mysql.com
ceb541e4bc
Bug#13487 Japanese data inside a comment causes the syntax error
...
mysql.cc:
Fixed not to copy multibyte characters to the
target string if we are inside a comment.
2005-09-28 15:46:09 +05:00
msvensson@neptunus.(none)
fbf4a5e079
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 11:34:53 +02:00
patg@krsna.patg.net
ac924f6b4f
BUG #7815 - Post-review fixes required for push.
2005-09-27 09:40:51 -07:00
msvensson@neptunus.(none)
1105d4293d
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/fix_mysqltest/my41-fix_mysqltest
2005-09-27 16:48:41 +02:00
patg@krsna.patg.net
8864a9b3c4
BUG #7815
...
Changes per serg to http://lists.mysql.com/internals/30281
Re-enabled --delayed-insert
2005-09-26 22:43:09 -07:00
monty@mysql.com
ea6d5f9ec3
Fixed error found during review of new pushed code
2005-09-25 21:22:23 +03:00
kent@mysql.com
095efe48a5
Makefile.am, configure.in:
...
Enable "make distcheck" to work
2005-09-24 15:51:45 +02:00
kent@mysql.com
0cfed79ea5
Makefile.am:
...
Revert to shell test script for test targets
mysqltest.c:
Windows pclose() returns error code in low byte
mysql_config.sh:
Remove -Xa -xstrconst from --cflags for Sun C++
2005-09-24 02:42:38 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
8d3036c35e
Some minor fixes revealed as warnings by
...
Intel compiler.
2005-09-23 21:28:56 +03:00
msvensson@neptunus.(none)
4f03ab4943
Bug #13384 mysqltest, no protocol when script contains only lines with eval
2005-09-22 21:52:04 +02:00
msvensson@neptunus.(none)
4700631aa8
Bug #13384 mysqltest, no protocol when script contains only lines with eval
2005-09-22 21:24:57 +02:00
serg@serg.mylan
306aa15391
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-merged
2005-09-21 17:42:44 +02:00
msvensson@neptunus.(none)
0581a7f23c
Bug #13231 mysqltest: fails to dectect when mysql_next_result fails
...
- Added functionality to check errors returned from mysql_next_result
- Exit from mysqltest when and unexpected error occurs.
- The above fixes reveal problems with rpl000009, sp-error and query_cache-
- Fix sp-error by adding an expected error
- Fix rpl000009 by not sending "ok" from mysql_create_db when called with silent flag from load_master_data
- Fix query_cache in separate patch
2005-09-21 15:28:28 +02:00
lars@mysql.com
ed7eac5973
Added clarification comment regarding added ROLLBACK to mysqlbinlog output
2005-09-21 14:27:41 +02:00
serg@serg.mylan
a083ff160e
merged
2005-09-21 13:53:22 +02:00
SergeyV@selena.
c2f734ce42
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into selena.:H:/MYSQL/src/#12929-mysql-4.1
2005-09-20 20:11:38 +04:00
msvensson@neptunus.(none)
523d2aad94
BUG#12959 mysqltest crashes if testcase passed with -x option
...
- Enable testcases after help from Serg
2005-09-20 14:11:58 +02:00
msvensson@neptunus.(none)
913f0bd610
Improved output
2005-09-20 12:13:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
468610635b
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-09-19 20:56:14 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
7c57c41a06
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-09-19 19:33:59 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
a8bdf632d3
Fixed Bug#13275 mysqltest empty file bug
2005-09-19 18:45:22 +03:00
msvensson@neptunus.(none)
c18980aeb6
Clean up printout of line numbers
2005-09-19 12:24:59 +02:00
SergeyV@selena.
2e9e0b33c5
Fixes bug #12929 . Uses my_cgets instead of _cgets function, thus eliminating
...
a restriction to 255 chars for editable buffer.
2005-09-16 01:56:16 +04:00
tulin@dl145c.mysql.com
a8eb0f176b
enabled mysqldump hex-blob option for bit fields
2005-09-14 15:46:31 +02:00
monty@mishka.mysql.fi
8b028bae87
Removed compiler warnings
2005-09-14 04:40:18 +03:00
serg@serg.mylan
43ff196ada
after pull review - many bugs in mysqldump --routines
2005-09-13 19:32:37 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
01ce8a8aa9
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-09-12 20:18:49 +03:00
monty@mishka.mysql.com
0965bfa832
Review fixes since last pull
...
Fix for bug #13025 ; Server crash in filesort because wrong call to handler::position()
2005-09-12 18:48:17 +03:00
patg@radha.local
f41aa04b59
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597
2005-09-10 01:50:38 +02:00
patg@radha.local
15bbf4d215
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597
2005-09-09 21:03:11 +02:00
patg@radha.local
06d1582b98
BUG #12597 This is a complete patch (2nd) containing fixes per Serg's review
2005-09-09 00:03:07 +02:00
patg@radha.local
4171c7435a
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
2005-09-08 22:29:13 +02:00
patg@radha.local
4cb63e6b8b
BUG #9056 Changes to patch #2 per Serg's review
2005-09-08 19:45:25 +02:00
hartmut@mysql.com
052e9262ee
Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-09-08 00:57:02 +02:00
hartmut@mysql.com
1e1872464b
Merge mysql.com:/home/hartmut/projects/mysql/dev/4.0
...
into mysql.com:/home/hartmut/projects/mysql/dev/4.1
2005-09-08 00:50:03 +02:00
msvensson@neptunus.(none)
5c8d457ec8
Backport fixes for mysqltest.test from 5.0
2005-09-06 22:03:12 +02:00
msvensson@neptunus.(none)
b39f23d2b7
Bug #12984 mysqltest.test: different output from "exec NonExistsinfComamdn"
...
- Common error handling regardless of --ps-protocol or not.
2005-09-06 15:41:13 +02:00
msvensson@neptunus.(none)
9c1c075da1
Detect comment with command using extra delimiter
2005-09-06 12:33:36 +02:00
msvensson@neptunus.(none)
acd68dbf41
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
2005-09-05 17:03:25 +02:00
msvensson@neptunus.(none)
7f848c1784
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
2005-09-05 17:01:15 +02:00
msvensson@neptunus.(none)
e21d8c50bf
Merge neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
2005-09-05 16:51:31 +02:00
msvensson@neptunus.(none)
72228ea825
Bug#12959 mysqltest crashes if testcase passed with -x option
2005-09-05 16:50:32 +02:00
patg@radha.local
953dda0673
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
2005-09-04 01:37:52 +02:00
patg@radha.local
03183c70c0
BUG #9056 Added --routines flag to mysqldump to enable mysqldump to be able
...
to dump PROCEDURES and FUNCTIONS.
2005-09-04 01:34:58 +02:00
jimw@mysql.com
3be42aabc5
Merge mysql.com:/home/jimw/my/mysql-5.0-11787
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-03 09:34:34 -07:00
hartmut@mysql.com
14485e71c2
fix for BUG#12958 : mysqlimport with -L option crashing on HP-UX
2005-09-02 22:52:52 +02:00
joerg@mysql.com
ed093d581a
Compile error fix.
2005-09-02 20:07:08 +02:00
msvensson@neptunus.(none)
1026fa2fe3
Fix for spelling miss and eol junk
2005-09-01 20:02:08 +02:00
msvensson@neptunus.(none)
28f529d91f
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
2005-09-01 17:21:03 +02:00
msvensson@neptunus.(none)
305dc01078
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
2005-09-01 17:15:37 +02:00
msvensson@neptunus.(none)
4b47ebcfc9
mysqltest improvements, updates after merge + test for 5.0
2005-09-01 17:01:23 +02:00
msvensson@neptunus.(none)
68778715ae
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug11286/my50-bug11286
2005-09-01 14:47:06 +02:00
msvensson@neptunus.(none)
61be2a143d
Merge neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
...
into neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
2005-09-01 12:53:23 +02:00
msvensson@neptunus.(none)
8c0f7f82d9
Bug #11286 yassl incompatible with "load data infile"
...
- Make sure that mysqltest always uses ssl when connecting to the server.
- Pass a i32-bit int variable as argument to FIONREAD ioctl.
2005-09-01 11:46:43 +02:00
msvensson@neptunus.(none)
72b08b7e57
Fix compiler warnings for mysqltest.c
2005-09-01 11:11:10 +02:00
msvensson@neptunus.(none)
ced32517c7
Bug #3131 mysqltest fails on $2=$1 assignment in test
2005-09-01 10:53:33 +02:00
msvensson@neptunus.(none)
906f7c4481
Bug #12471 mysqltest, --error within loop affects wrong statement
...
- Move clearing of expected errors
2005-09-01 09:34:40 +02:00
msvensson@neptunus.(none)
d692f0c045
Remove syntax !$<err_no> to set an expected error code
...
Use !<err_no> instead
2005-08-31 18:10:26 +02:00
msvensson@neptunus.(none)
2fc6ef3a40
BUG#11316: mysqltest, problems when assigning value with '#' to $variable
...
- Add stricter checking of syntax in mysqltest
2005-08-31 17:16:05 +02:00
jimw@mysql.com
25adba36b1
Merge mysql.com:/home/jimw/my/mysql-5.0-11523
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-29 10:02:23 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
7b7188cea6
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-08-26 15:56:52 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 12:08:26 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0
Several fixes for Netware.
2005-08-24 22:03:34 +03:00
msvensson@neptunus.(none)
9ed35f83fa
BUG#10267 mysqltest, wrong number of loops when a script is sourced within a loop
2005-08-16 17:10:52 +02:00
serg@sergbook.mysql.com
2870638ef2
client/mysql.cc
...
mysql default port cleanup (it's set in libmysql.c, NOT in my_getopt)
configure.in
autoconf 2.52 is enough to build mysql-5.0
2005-08-14 14:06:47 +02:00
bar@mysql.com
1b50f35ab2
Merge mysql.com:/usr/home/bar/mysql-4.1.b12351
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-08-12 17:10:00 +05:00
acurtis@xiphis.org
b9476f7d50
Merge xiphis.org:/usr/home/antony/work2/mysql-4.1
...
into xiphis.org:/usr/home/antony/work2/merge-5.0
2005-08-11 12:18:53 +01:00
patg@radha.local
8c83f14b76
BUG #12253 . Fixed logic the prevented repair when "--fast" was included
...
in invoking mysqlcheck.
2005-08-10 23:37:17 +02:00
jimw@mysql.com
397cef9413
Fix 'source' command in mysql client to handle delimiter command
...
in sourced file properly. (Bug #11523 )
2005-08-09 12:17:28 -07:00
monty@mysql.com
7b1aed3fba
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-08-09 00:15:27 +03:00
patg@krsna.patg.net
74c7168992
BUG #12119
...
Removed unnecessary error message from mysql.cc (client program)
2005-08-08 13:50:10 -07:00
konstantin@mysql.com
85e9801651
Fix gcc -ansi -pedantic compilation failure.
2005-08-05 11:10:51 +04:00
jimw@mysql.com
de46ae18c2
Merge mysql.com:/home/jimw/my/mysql-5.0-11602
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-02 16:50:12 -07:00
monty@mishka.local
7f845036c0
After merge fixes
...
Review of new pushed code
2005-07-31 22:56:24 +03:00
monty@mishka.local
e73d6c25fd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-07-31 12:56:02 +03:00
monty@mishka.local
8437e9c1be
Fixes during review of new pushed code
...
Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
2005-07-31 12:49:55 +03:00
bell@sanja.is.com.ua
36f250a240
Added sql_mode saving to mysql_dump (BUG#5891, part 2)
2005-07-29 23:39:08 +03:00
monty@mysql.com
987edeaa9b
Fixed compiler warnings
2005-07-28 21:25:05 +03:00
jimw@mysql.com
0536bd6679
Increase allowed size of stored procedure bodies to 4GB, and
...
produce a sensible error when that limit is exceeded. (Bug #11602 )
2005-07-26 18:08:49 -07:00
patg@radha.local
8d671d7bca
Applied and tested this patch successfully (bug 10431) to a clean
...
tree on brian's amd 64 box (which was already approved).
[patg@zim mysql-5.0]$ bk changes
ChangeSet@1.1882 , 2005-07-21 18:43:55+05:00, gluh@eagle.intranet.mysql.r18.ru
merge fix
Was the changeset level I applied this patch to.
Master shutdown finished
Slave shutdown finished
All 326 tests were successful.
[patg@zim mysql-5.0]$
2005-07-22 04:11:45 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
0f7639ba15
Added some missing casts and changed a define for alloca().
2005-07-20 13:27:57 +03:00
konstantin@mysql.com
52b8928b09
Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
...
into mysql.com:/home/kostja/mysql/mysql-5.0-merge
2005-07-19 00:55:37 +04:00
monty@mishka.local
2278e0319c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-07-18 19:03:01 +03:00
monty@mishka.local
78c65b5adc
Cleanups during review
...
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
2005-07-18 15:33:18 +03:00
jimw@mysql.com
eb785d70b8
Fix error in formatting metadata in mysqltest.
2005-07-15 12:31:57 -07:00
msvensson@neptunus.(none)
447a119407
BUG#11316 mysqltest, problems when assigning value with '#' to $variable
...
- Fixed problem, only detect comment if the # is on start of line AND starting line of the current command.
- Wrote tests for most of the mysqltest commands, added stricter checking of correct syntax.
2005-07-15 17:51:43 +02:00
jimw@mysql.com
bef1c77789
Make it possible to change reconnect setting with
...
mysql_options(..., MYSQL_OPT_RECONNECT, ...). (Bug #11787 )
2005-07-06 16:29:31 -07:00
kent@mysql.com
ca420edc21
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-07-06 00:15:55 +02:00
kent@mysql.com
8e3b393d5c
Merge
2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a
Makefile.am:
...
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
mats@mysql.com
0449ee1ca8
Merging 4.1 into 5.0
2005-07-05 16:02:03 +02:00
monty@mysql.com
86d7b02199
Merge with 4.1
2005-07-03 14:17:52 +03:00
lars@mysql.com
02d0fdf470
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/b11678-mysql-4.1
2005-07-01 16:13:05 +02:00
msvensson@neptunus.(none)
ead7b076dc
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-07-01 15:40:42 +02:00
msvensson@neptunus.(none)
11d3c28575
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-07-01 15:40:29 +02:00
msvensson@neptunus.(none)
9613c434e0
Win port fixes
2005-07-01 15:39:36 +02:00
lars@mysql.com
4120003926
BUG#11678: mysqldump --master-data should fail if master binlog disabled
2005-07-01 12:01:00 +02:00
msvensson@neptunus.(none)
ca2ad9cdf6
Merge
2005-06-30 19:21:38 +02:00
msvensson@neptunus.(none)
14e778e43a
After review fixes
2005-06-30 19:15:39 +02:00
pem@mysql.comhem.se
6fd1e8227e
Fixed compiler errors (i.e. changed C++-isms into C)
2005-06-29 14:23:43 +02:00
monty@mishka.local
7398252d02
Portability fixes
...
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning
2005-06-27 20:31:00 +03:00
msvensson@neptunus.(none)
7d42249bf1
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 15:14:23 +02:00
msvensson@neptunus.(none)
87d681c7bb
Include <sys/wait.h> to get WEXITSTATUS
2005-06-27 15:11:40 +02:00
msvensson@neptunus.(none)
5e703ebbbb
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 15:02:39 +02:00
msvensson@neptunus.(none)
f8472c0e49
Add "#include <stdlib.h>" to define WEXITSTATUS
2005-06-27 15:01:49 +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)
e9e048f321
Merge fix
2005-06-22 15:29:08 +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)
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