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