mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39602 commits 2780 branches 343 tags 1.6 GiB
Commit graph

2126 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
dedea59a6c Add comment and remove strange assignment in 'do_exec' 2006-10-07 19:47:42 +02:00
msvensson@neptunus.(none)
fdbdc679ca Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-07 19:14:30 +02:00
msvensson@neptunus.(none)
3faa1fcd4f Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-07 19:12:10 +02:00
msvensson@neptunus.(none)
487e2506c0 Two implementations of "get_err_code_from_name", one use if mysqld_ername.h is available and oe if it's not 
Declare "to_ptr" first in block
 2006-10-07 19:09:40 +02:00
mats@romeo.(none)
d4d26ba7d5 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b19459-mysql-5.1-new
 2006-10-06 15:31:05 +02:00
msvensson@neptunus.(none)
37be4fdff6 Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-06 13:18:52 +02:00
msvensson@neptunus.(none)
5a15eeca7c Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-06 13:16:57 +02:00
msvensson@neptunus.(none)
6273db415e Merge neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-06 13:12:53 +02:00
mats@romeo.(none)
e762328b54 BUG#19459 (BINLOG RBR command does not lock tables correctly causing 
crash for, e.g., NDB):

Before, mysqlbinlog printed table map events as a separate statement, so
when executing the event, the opened table was subsequently closed
when the statement ended. Instead, the row-based events that make up
a statement are now printed as *one* BINLOG statement, which means
that the table maps and the following *_rows_log_event events are
executed fully before the statement ends.

Changing implementation of BINLOG statement to be able to read the 
emitted format, which now consists of several chunks of BASE64-encoded
data.
 2006-10-06 10:17:02 +02:00
msvensson@neptunus.(none)
e2496d3016 Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools 
into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
 2006-10-06 01:06:02 +02:00
msvensson@neptunus.(none)
3eaeeca6de Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools 
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
 2006-10-06 01:00:35 +02:00
msvensson@neptunus.(none)
ae4df31df4 Add printout of file in which warning was detected 
Cleanup .progress, .reject, .log and .warnings files produced by mysqltest
 2006-10-06 00:57:10 +02:00
msvensson@neptunus.(none)
1f8ac39af1 Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools 
into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
 2006-10-05 22:07:34 +02:00
msvensson@neptunus.(none)
7fb9bac13a Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools 
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
 2006-10-05 22:06:51 +02:00
msvensson@neptunus.(none)
02693c37d9 Add policy directive about keeping mysqltest framework tools identical in all versions 2006-10-05 22:05:42 +02:00
msvensson@neptunus.(none)
a9e0652189 Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools 
into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
 2006-10-05 18:52:30 +02:00
msvensson@neptunus.(none)
b7d7f25083 Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools 
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
 2006-10-05 18:45:40 +02:00
msvensson@neptunus.(none)
c5fba0a888 Bug #20010 mysql-test-run.pl: --record and --require conflict (test fails) 
- When --record is passed to mysqltest the whole testcase should be executed
as it normally is while the output form the test is acumulating
in ds_res. When test has finished ds_res should simply be written to the
specified result file(if any) instead of comapring it against the result file.
Simplify handling of --require and also the cecking of result files by splitting
check_result function into one  function 'check_require' that is specialised in
checking require's and leave 'check_result' to do just that.
- "mysqltest --record" has been considered unsafe, but with this really simple
logic, it should be safe to use.
 2006-10-05 18:00:20 +02:00
msvensson@neptunus.(none)
ea4bee3dfa Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools 
into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
 2006-10-05 12:45:09 +02:00
msvensson@neptunus.(none)
ad967609a9 Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools 
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
 2006-10-05 12:42:39 +02:00
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)
9be910079f Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools 
into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
 2006-10-04 23:51:36 +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
6ff8998d3c Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my51-bug19660 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-10-04 16:41:45 -04:00
iggy@rolltop.ignatz42.dyndns.org
9977eea685 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my50-bug19660 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my51-bug19660
 2006-10-04 15:34:03 -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
stewart@willster.(none)
276aaa2164 BUG#20809 mysqldump does not backup TS and LG information correctly 
restore of the dump (ndb_dd_dump test) was failing for probably a merge problem. fixed now.
 2006-10-05 00:56:06 +10:00
msvensson@neptunus.(none)
8929b7a03b Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools 
into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
 2006-10-04 16:35:40 +02: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@neptunus.(none)
237779218c Merge bk-internal:/home/bk/mysql-5.1-new-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-03 15:56:56 +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
bar@bar.intranet.mysql.r18.ru
3cfbe36adc After merge fix 2006-10-03 16:00:09 +05:00
tsmith/tim@siva.hindu.god
5ceadf8987 Merge siva.hindu.god:/usr/home/tim/m/bk/wl3516/50 
into  siva.hindu.god:/usr/home/tim/m/bk/wl3516/51
 2006-09-29 14:12:57 -06: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
msvensson@shellback.(none)
010fb6bfcd No need to spcify start_lineno in die message, that is automatic 2006-09-29 11:39:54 +02:00
msvensson@shellback.(none)
d6ad8e3ea1 Merge shellback.(none):/home/msvensson/mysql/my51-mysqltest-new-commands 
into  shellback.(none):/home/msvensson/mysql/same_tools/my51-same_tools
 2006-09-29 11:35:17 +02:00
msvensson@shellback.(none)
b7977855e4 Add possibility to specify which delimiter to read until in "write_file" and "perl" commands 
fix memory leaks reported by valgrind
 2006-09-29 11:32:40 +02:00
msvensson@shellback.(none)
b9eda58afb Merge shellback.(none):/home/msvensson/mysql/my51-mysqltest-new-commands 
into  shellback.(none):/home/msvensson/mysql/same_tools/my51-same_tools
 2006-09-29 11:32:09 +02:00
cmiller@zippy.cornsilk.net
ce24cb2d98 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476
 2006-09-28 09:51:46 -04: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
6042eebda6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-28 07:35:04 -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
d34940c909 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476
 2006-09-27 15:48:40 -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@dl145k.mysql.com
60e178bb73 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1
 2006-09-23 08:45:26 +02: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@dl145j.mysql.com
57a74ea4af Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-21 00:23:20 +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
stewart@willster.(none)
e7a1495f22 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20809
 2006-09-20 17:23:46 +10:00
stewart@willster.(none)
6a98b6c39e Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073
 2006-09-20 15:27:45 +10:00
mskold/marty@mysql.com/linux.site
b98987db17 C style comments 2006-09-19 15:18:43 +02:00
mskold/marty@mysql.com/linux.site
e8abf51de1 Bug #18679 rpl_ndb_dd_advance.test fails randomly 2006-09-19 11:31:55 +02:00
stewart@willster.(none)
6ff9664d46 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073
 2006-09-19 18:36:18 +10:00
stewart@willster.(none)
40dffeba03 BUG#20809 mysqldump does not backup TS and LG information correctly. 
We were not parsing the EXTRA field to get UNDO_BUFFER_SIZE for the
CREATE LOGFILE GROUP statement in the dump.
 2006-09-19 17:07:21 +10:00
stewart@willster.(none)
49eb41e09d BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS, 
Change things around so that we add a row for each log file group that lists
the free space for that log file group.
 2006-09-19 01:44:32 +10: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
ramil/ram@myoffice.izhnet.ru
8445f3e3de Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/usr/home/ram/work/mysql-5.1-maint
 2006-09-15 14:15:09 +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
a1e9531d29 Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca 
into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint
 2006-09-15 04:14:46 +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@dl145j.mysql.com
a3adcfe52d Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-15 01:46:47 +02: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
dlenev@mockturtle.local
5ba1b83c98 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-09-14 23:53:35 +04:00
iggy@rolltop.ignatz42.dyndns.org
453c5c5aa8 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my50-bug21424 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my51-bug21424
 2006-09-14 14:57:11 -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
4cb1fdfb35 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my50-bug21618 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my51-bug21618
 2006-09-14 09:56:06 -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)
5a6cee9e1c Merge neptunus.(none):/home/msvensson/mysql/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-12 15:38:02 +02:00
lars/lthalmann@dl145k.mysql.com
a1c70022f2 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-11 17:14:40 +02: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
ahristov@bk-internal.mysql.com
75eeececb1 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-runtime 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-wl3337
 2006-09-06 14:35:27 +02:00
cmiller@zippy.cornsilk.net
d58cd1de27 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:03:58 -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)
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)
4d29dd1f3b Merge rama.(none):/home/jimw/my/mysql-5.0-clean 
into  rama.(none):/home/jimw/my/mysql-5.1-clean

mysqldump.result is wrong, will need to be cleaned up.
 2006-08-31 21:02:17 -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