msvensson@neptunus.(none)
6e405f5888
Improve "check_eol_junk" to detect junk although there are multi line comments in the way.
...
I.e take advantage of the fact that a # comment is always terminated by a new line
Add tests for the above
2006-10-05 12:25:24 +02:00
msvensson@neptunus.(none)
a915d6951e
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 23:49:22 +02:00
msvensson@neptunus.(none)
2d5c7c42a3
Update "get_errcode_from_name"
...
- add missing DBUG_RETURN
- Change type of st_error->code to uint, that should be more than enough
to hold the error numbers between 1000 and around 2000
2006-10-04 23:34:05 +02:00
iggy@rolltop.ignatz42.dyndns.org
8280c6baaa
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my41-bug19660
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
2006-10-04 16:46:00 -04:00
iggy@rolltop.ignatz42.dyndns.org
5ed44ed09f
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my50-bug19660
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-10-04 16:44:51 -04:00
iggy@rolltop.ignatz42.dyndns.org
71ace9598d
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my41-bug19660
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my50-bug19660
2006-10-04 15:31:14 -04:00
msvensson@neptunus.(none)
6b15f7680a
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 16:30:56 +02:00
msvensson@shellback.(none)
5aac9b58eb
Don't print version in error message, just too messy to test
2006-10-04 12:27:05 +02:00
msvensson@neptunus.(none)
5cb71d48d2
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 01:21:03 +02:00
msvensson@neptunus.(none)
54a76f4946
Add possibility to send warnings about suspicious commands in .test file to <result_file_name>.warnings file
...
Move detection of "parsing enabled" to after command has been read.
Cleanup parsing enabled/disabled
2006-10-04 01:20:08 +02:00
msvensson@neptunus.(none)
5cdbeab88c
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-03 23:13:19 +02:00
msvensson@neptunus.(none)
89a53ef374
Fix problem when both option SSL and COMPRESS specified
2006-10-03 23:11:47 +02:00
iggy@rolltop.ignatz42.dyndns.org
728588da38
Bug#19660 mysqldump --single-transaction should be with CONSISTENT SNAPSHOT
2006-10-03 11:26:50 -04:00
msvensson@shellback.(none)
1a9db6b7fd
Merge shellback.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into shellback.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-03 16:36:26 +02:00
msvensson@shellback.(none)
51b04fe458
Add mysys/my_copy.c as sources for mysqltest
2006-10-03 16:35:46 +02:00
msvensson@shellback.(none)
538e1881ce
Fix typo
...
- Change con_host to ds_connection_name.str
2006-10-03 16:34:44 +02:00
msvensson@shellback.(none)
de8bc06266
Merge shellback.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into shellback.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-03 16:14:23 +02:00
msvensson@shellback.(none)
2cea0e6b13
Update mysqltest to latest version
...
- ie. backport from 5.1
- also update testcase error dected by new version
2006-10-03 15:33:44 +02:00
msvensson@neptunus.(none)
3f8edc3706
Merge bk-internal:/home/bk/mysql-5.0-rpl
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-03 14:24:43 +02:00
tsmith/tim@siva.hindu.god
b7d0ec2422
WL #3516 : MySQL Enterprise: implement Version Display Specification
...
Print version_comment after server version in:
mysql.cc: Welcome message and 'status' command output
log.cc: Top of log files
2006-09-29 12:52:48 -06:00
bar@mysql.com/bar.intranet.mysql.r18.ru
8b0f82b9b8
Bug#21263 mysql client XML output does not distinguish between NULL and string 'NULL'
...
Fix: "mysql --xml" now print NULL values the same way that "mysqldump --xml" does:
<field name="name" xsi:nil="true" />
to distinguish from empty strings:
<field name="name"></field>
and from string "NULL":
<field name="name">NULL</field>
2006-09-29 16:29:39 +05:00
cmiller@zippy.cornsilk.net
75a1d1d56f
Additional patch to Bug#21476: Free newly-allocated memory in mysqltest.
2006-09-28 09:51:06 -04:00
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