Commit graph

274 commits

Author SHA1 Message Date
tnurnberg@mysql.com
d10bec1c34 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/tnurnberg/review/mysql-5.0-maint-20588
2006-06-26 19:44:27 +02: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
tnurnberg@mysql.com
701a4f18d1 Bug#20588: mysqldump.test may fail, depending on system-wide configuration
mysqldump.test calls my_print_defaults in a way that includes the systemwide
my.cnf, so the results will be beyond our control and depend on whatever the
user has in their my.cnf, namely the [mysqldump] section.

call my_print_defaults with --config-file rather than --defaults-extra-file
to prevent inclusion of system-wide defaults and use our config-file only.
2006-06-23 00:32:43 +02:00
lars@mysql.com
6b8c196584 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-21 14:14:37 +02: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
lars@mysql.com
ad809c6b15 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-19 13:30:54 +02:00
lars@mysql.com
67e476f29f BUG#17201 Changed to other database (BUG#20531 hinders usage of 'test' database) 2006-06-19 13:23:13 +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
lars@mysql.com
1d1c42e0a7 BUG#17201: Removed version number from test case output 2006-06-15 11:55:53 +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
monty@mysql.com
430347f126 After merge fixes
Remove compiler warnings
2006-06-05 06:16:08 +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
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
jani@a193-229-222-105.elisa-laajakaista.fi
c81b4c01bf Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2006-05-30 16:07:49 +03: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
msvensson@neptunus.(none)
91e4fd9ac9 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-29 09:06:06 +02:00
ramil@mysql.com
6b2ab800c9 manual merge 2006-05-29 11:17:38 +05:00
grog@mysql.com
01c1eaa26e mysqldump.result:
Get output from modified test (dropping t1).
mysqldump.test:
  Drop t1 at end so that the next test doesn't trip over it.
2006-05-26 11:00:35 +09:30
grog@mysql.com
1f86b3f100 BUG#17201: Improve handling of views. 2006-05-25 17:30:28 +09:30
msvensson@neptunus.(none)
dcf9810cb1 Merge neptunus.(none):/home/msvensson/mysql/bug15328/my41-bug15328
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-05-24 10:16:31 +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
aelkin@mysql.com
f7f83cd04c Bug#19728: Test mysqldump failure
regex is fixed for windows.
2006-05-12 12:32:44 +03:00
msvensson@neptunus.(none)
22ff4c2865 Bug#15328 Segmentation fault occured if my.cnf is invalid for escape sequence
- Check that length of value is longer than 1 before decrementing length by 2.
 - Backport from 5.0, make it possible to use my_print_defaults in tests
2006-05-11 14:13:14 +02:00
msvensson@neptunus.(none)
4736d8d53c Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-10 15:49:33 +02:00
jani@ua141d10.elisa.omakaista.fi
0410832526 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2006-05-04 18:35:58 +03:00
tnurnberg@mysql.com
5becb110e0 Bug#19025 4.1 mysqldump doesn't correctly dump "auto_increment = [int]"
mysqldump / SHOW CREATE TABLE will show the NEXT available value for
the PK, rather than the *first* one that was available (that named in
the original CREATE TABLE ... AUTO_INCREMENT = ... statement).

This should produce correct and robust behaviour for the obvious use
cases -- when no data were inserted, then we'll produce a statement
featuring the same value the original CREATE TABLE had; if we dump
with values, INSERTing the values on the target machine should set the
correct next_ID anyway (and if not, we'll still have our AUTO_INCREMENT =
... to do that). Lastly, just the CREATE statement (with no data) for
a table that saw inserts would still result in a table that new values
could safely be inserted to).

There seems to be no robust way however to see whether the next_ID
field is > 1 because it was set to something else with CREATE TABLE
... AUTO_INCREMENT = ..., or because there is an AUTO_INCREMENT column
in  the table (but no initial value was set with AUTO_INCREMENT = ...)
and then one or more rows were INSERTed, counting up next_ID. This
means that in both cases, we'll generate an AUTO_INCREMENT =
... clause in SHOW CREATE TABLE / mysqldump.  As we also show info on,
say, charsets even if the user did not explicitly give that info in
their own CREATE TABLE, this shouldn't be an issue.

As per above, the next_ID will be affected by any INSERTs that have
taken place, though.  This /should/ result in correct and robust
behaviour, but it may look non-intuitive to some users if they CREATE
TABLE ... AUTO_INCREMENT = 1000 and later (after some INSERTs) have
SHOW CREATE TABLE give them a different value (say, CREATE TABLE
... AUTO_INCREMENT = 1006), so the docs should possibly feature a
caveat to that effect.

It's not very intuitive the way it works now (with the fix), but it's
*correct*.  We're not storing the original value anyway, if we wanted
that, we'd have to change on-disk representation?

If we do dump/load cycles with empty DBs, nothing will change.  This
changeset includes an additional test case that proves that tables
with rows will create the same next_ID for AUTO_INCREMENT = ... across
dump/restore cycles.

Confirmed by support as likely solution for client's problem.
2006-05-04 03:12:51 +02:00
monty@mysql.com
8f6ed291a7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-05-04 01:58:21 +03:00
monty@mysql.com
d689f2fa70 Cleanups after review of WL#602
Fixed warnings from test suite
Some fixes in mysql-test-run script to catch more warnings
2006-05-03 19:40:52 +03:00
cmiller@zippy.(none)
a5789854ee Added code to remove closing comment code from event text, as would be
supplied inside a  /*!VERSION event-text */  segment.  (Fixes Bug#18078
2006-05-03 09:55:34 -04:00
cmiller@calliope.local
9747057fa9 Merge calliope.local:/Users/cmiller/work/src/mysql-5.1-new
into  calliope.local:/Users/cmiller/work/src/mysql-5.1-new__cleanup_mysqldump
2006-03-09 15:22:11 -05:00
cmiller@calliope.local
d3c0dc0eed Added code to mysqldump to dump timed events when instructed to do so, with
the '-E' or '--events' flag.  (Closes Bug#16853 and Bug#17714.)


WARNING:

At present, these tests fail due to b*g number 18078.
2006-03-09 15:12:43 -05:00
kent@mysql.com
0aaded3707 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-07 18:21:38 +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
knielsen@mysql.com
436587e997 Fix mysqldump.test to work with non-standard --vardir.
(Backported from mysql-5.1-new)
2006-02-24 13:51:04 +01:00
knielsen@mysql.com
97229ca7fc Fix mysqldump.test to work with non-standard --vardir. 2006-02-24 10:15:39 +01:00
msvensson@neptunus.(none)
3ece1f3eda Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 10:54:56 +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)
6efee6c42c Merge neptunus.(none):/home/msvensson/mysql/bug16878/my51-bug16878
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 17:25:21 +01:00
msvensson@neptunus.(none)
334b9c7a27 Merge neptunus.(none):/home/msvensson/mysql/bug16878/my50-bug16878
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 17:19:46 +01:00
msvensson@neptunus.(none)
d722c5c60d Merge neptunus.(none):/home/msvensson/mysql/bug16878/my50-bug16878
into  neptunus.(none):/home/msvensson/mysql/bug16878/my51-bug16878
2006-02-21 17:15:37 +01:00
msvensson@neptunus.(none)
d35ba92a24 Merge neptunus.(none):/home/msvensson/mysql/bug14871/my51-bug14871
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 15:57:56 +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)
f64effb570 Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871
into  neptunus.(none):/home/msvensson/mysql/bug14871/my51-bug14871
2006-02-21 15:03:15 +01:00
msvensson@neptunus.(none)
e50d43b41a Bug#14857 Reading dump files with single statement stored routines fails.Bug #14857 Reading dump files with single statement stored routines fails.
- Add tests, fixed by patch for 16878
2006-02-21 13:43:29 +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)
8e760bc6cc Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 10:37:10 +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)
4cde1d1259 Bug#17382 mysql-test-run mysqldump fails with mysqlimport 2006-02-20 13:04:40 +01:00
msvensson@neptunus.(none)
ace6f14267 Bug#17382 mysql-test-run mysqldump fails with mysqlimport: Error:client run out of memory
- Disable --use-threads option in 5.1.7
2006-02-17 18:19:29 +01:00