Commit graph

30440 commits

Author SHA1 Message Date
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
svojtovich@production.mysql.com
1890b04e13 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  production.mysql.com:/usersnfs/svojtovich/mysql-5.0
2006-05-03 23:17:17 +02:00
holyfoot@mysql.com
2f7ac18f22 Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-04 02:17:17 +05:00
pekka@mysql.com
ec42119233 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/space/pekka/ndb/version/my50
2006-05-03 23:17:16 +02:00
aivanov@mysql.com
7a74734219 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss521
2006-05-04 01:17:15 +04:00
aivanov@mysql.com
4cff042a58 Applied innodb-5.0-ss521 snapshot.
Fixed BUG#19366: "consistent_snapshot.test fails".
2006-05-04 00:32:34 +04:00
holyfoot@mysql.com
7d47127e86 Merge bk@192.168.21.1:mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1.mrg
2006-05-04 00:45:56 +05:00
aivanov@mysql.com
b695bb4624 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/alexi/innodb/mysql-4.1-ss26
2006-05-03 23:45:55 +04:00
aivanov@mysql.com
a7122276a4 Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss26-work
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work
 Null-merge.
2006-05-03 23:29:27 +04:00
aivanov@mysql.com
d546f0d93e Applied innodb-4.1-ss26 snapshot.
Fixed BUG#19366: "consistent_snapshot.test fails".
2006-05-03 23:25:01 +04:00
holyfoot@mysql.com
e5a22d1bca Merge bk@192.168.21.1:mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1.mrg
2006-05-04 00:03:58 +05:00
msvensson@neptunus.(none)
667435103d Check if "../libtool" is available and use it only when it is. 2006-05-03 20:04:57 +02:00
msvensson@neptunus.(none)
5feae9aa4e Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-03 19:41:57 +02:00
msvensson@neptunus.(none)
7aba56f452 Use "const char*" for variable found, forte complains "Cannot use const char* to initialize char*" otherwise 2006-05-03 17:55:30 +02:00
msvensson@neptunus.(none)
896704c648 Remove C++ comments
Formatting
2006-05-03 16:59:02 +02:00
kroki@mysql.com
96f0aa3cfb Bug#15463: EXPLAIN SELECT..INTO hangs the client (QB, command line)
There were two distict bugs: parse error was returned for valid
statement and that error wasn't reported to the client.

The fix ensures that EXPLAIN SELECT..INTO is accepted by parser and any
other parse error will be reported to the client.
2006-05-03 18:02:43 +04:00
holyfoot@deer.(none)
5b5db01a46 merging fix 2006-05-03 19:01:29 +05:00
msvensson@neptunus.(none)
7c8c14c435 Move "max-connect-retries" option to get alpabetichal order 2006-05-03 15:53:59 +02:00
holyfoot@deer.(none)
81e625ac4a merging fix 2006-05-03 17:43:32 +05:00
msvensson@devsrv-b.mysql.com
4a755e085b Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/mysql-5.0-maint
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0-maint
2006-05-03 14:12:38 +02:00
msvensson@neptunus.(none)
f0ac0fdf06 Add an untrusted cacert used when testing 2006-05-03 14:10:22 +02:00
msvensson@neptunus.(none)
e1b41812b7 Load CA certs before setting local certs.
Make it possible to get the yaSSL error message printed in the DBUG log file.
2006-05-03 14:09:08 +02:00
msvensson@neptunus.(none)
99475e7f4c Add tests for connecting to server with invalid and blank certs. 2006-05-03 14:06:34 +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
f66bcd2535 Merge mysql.com:/home/hf/work/mysql-5.0.18455
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-03 16:48:15 +05:00
holyfoot@mysql.com
86cab8533f merging 2006-05-03 16:47:05 +05:00
holyfoot@mysql.com
7ee205f67a merging 2006-05-03 16:42:39 +05:00
svoj@april.(none)
365e38b05c Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG17810/mysql-5.0
2006-05-03 16:37:42 +05:00
svoj@april.(none)
23d304b312 Merge april.(none):/home/svoj/devel/mysql/BUG18160/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG17810/mysql-5.0
2006-05-03 16:36:00 +05:00
holyfoot@mysql.com
9de68b8122 merging 2006-05-03 16:33:42 +05:00
msvensson@neptunus.(none)
3dc1365b02 Merge 192.168.0.20:mysql/my50-maint-yassl
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-03 13:24:06 +02:00
msvensson@shellback.(none)
bb5c6d4382 Add original unmodified certs file 2006-05-03 13:20:51 +02:00
msvensson@shellback.(none)
987c85adb5 Add certs/ file 2006-05-03 13:11:04 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
9b472ef26a Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2006-05-03 14:10:33 +03:00
msvensson@shellback.(none)
e2854b8a7f Update yaSSL to version 1.3.0 2006-05-03 13:08:24 +02:00
holyfoot@mysql.com
8667344572 Merge hf@192.168.21.28:work/mysql-4.1.16892
into mysql.com:/home/hf/work/mysql-4.1.mrg
2006-05-03 15:53:36 +05:00
holyfoot@mysql.com
486693e219 Merge mysql.com:/home/hf/work/mysql-4.1.15442
into mysql.com:/home/hf/work/mysql-4.1.mrg
2006-05-03 15:52:07 +05:00
holyfoot@mysql.com
0007484c26 Merge mysql.com:/home/hf/work/mysql-4.1.15225
into mysql.com:/home/hf/work/mysql-4.1.mrg
2006-05-03 15:51:19 +05:00
msvensson@neptunus.(none)
7d9efcc206 Make cert's in std_data that we cpoy from SSL/ depend on the cert's in SSL/ 2006-05-03 12:05:04 +02:00
msvensson@neptunus.(none)
0903ca8bfa Merge 192.168.0.20:mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-03 11:59:43 +02:00
msvensson@shellback.(none)
ff7be64f9b Remove client-req-pem and server-req.pem 2006-05-03 11:53:16 +02:00
msvensson@shellback.(none)
0d49a17801 Update NOTES with information how we generate new keys 2006-05-03 11:50:45 +02:00
msvensson@shellback.(none)
21bf41fab0 Generate new ca, client and server cert.
Set CN in the server cert to localhost so that we can test --ssl-verify-server-cert
2006-05-03 11:31:23 +02:00
igor@rurik.mysql.com
ae4eb6b50f Fixed bug #14292: performance degradation for a benchmark query.
This performance degradation was due to the fact that some
cost evaluation code added into 4.1 in the function find_best was
not merged into the code of the function best_access_path added
together with other code for greedy optimizer.
Added a parameter to the function print_plan. The parameter contains
accumulated cost for a given partial join.
 
The patch does not include a special test case since this performance
degradation is hard to reproduse with a simple example.

TODO: make the function find_best use the function best_access_path
in order to remove duplication of code which might result in incomplete
merges in the future.
2006-05-02 18:31:20 -07:00
pekka@mysql.com
2b25349820 pekka:get - push push push 2006-05-02 21:47:53 +02:00
cmiller@zippy.(none)
d71f198333 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
2006-05-02 15:08:47 -04:00
cmiller@zippy.(none)
0f63c3d39c An update to as-yet unused new feature of snprintf, which was added to bring
our sprintf()-alike in sync with our fprintf()-alike features.
2006-05-02 13:42:35 -04:00
dlenev@mysql.com
c40f8557dc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/mysql-5.0-bg11081
2006-05-02 17:07:23 +04:00
msvensson@neptunus.(none)
f9194996c4 Use libtool --mode=execute when starting the mysqld as well.
Add $exe_libtool to be used throughout the script
2006-05-02 14:46:18 +02:00
pekka@mysql.com
5c0012cb98 ndb - bug#19201 (4.1), see comment in NdbBlob.cpp 2006-05-02 14:33:55 +02:00