1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-01 17:39:21 +03:00
Commit Graph

1659 Commits

Author SHA1 Message Date
jonas@perch.ndb.mysql.com
e600a3d394 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-10 11:25:24 +02:00
unknown
e5c306cb93 BUG#20839 Illegal error code: 155 returned downgrading from 5.1.12-> 5.1.11
Update mysqldump to dump the needed tablespaces to create the tables
for either the dbs or tables we're dumping.

With --all-tablespaces, we still dump everything.


client/mysqldump.c:
  Add --no-tablespaces to force not dumping any tablespace information
  
  Change behaviour so that:
  If dumping all databases, all tablespaces are dumped
  If dumping with --all-tablespaces, all tablespaces are dumped
  If dumping a set of databases, dump only tablespaces used by tables in that database
  If dumping a set of tables, dump only tablespaces used by those tables
  
  If --no-tablespaces is specified, no tablespaces are dumped.
  
  Default behaviour is to dump a restorable dump - i.e. with the tablespaces.
  
  When connecting to old mysqld, --no-tablespaces should be specified.
sql/sql_show.cc:
  Use the TABLESPACE_NAME field of the INFORMATION_SCHEMA.PARTITIONS table.
  
  NOTE: *CHANGE* in behaviour: if no tablespace, TABLESPACE_NAME will be NULL.
  This is to support a tablespace called 'default' (which you can happily create).
  
  It is likely that the other fields with 'default' should change too.
  
  This should also happily continue to work in the future (from a user point of view)
  when we introduce tablespace per partition.
2006-10-10 00:03:46 +10:00
stewart@willster.(none)
78f976d78e BUG#20839 Illegal error code: 155 returned downgrading from 5.1.12-> 5.1.11
Update mysqldump to dump the needed tablespaces to create the tables
for either the dbs or tables we're dumping.

With --all-tablespaces, we still dump everything.
2006-10-10 00:03:46 +10:00
unknown
ed13b0ee03 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my41-bug19660
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint


client/mysqldump.c:
  Auto merged
2006-10-04 16:46:00 -04: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
unknown
b5b5e902af Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my50-bug19660
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


client/mysqldump.c:
  manula merge
2006-10-04 16:44:51 -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
unknown
270d4c9ded Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my51-bug19660
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint


client/mysqldump.c:
  Auto merged
2006-10-04 16:41:45 -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
unknown
26b34e829c Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my50-bug19660
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my51-bug19660


client/mysqldump.c:
  manual merge.
2006-10-04 15:34:03 -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
unknown
d3144a9d6c Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my41-bug19660
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my50-bug19660


client/mysqldump.c:
  Auto merged
2006-10-04 15:31:14 -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
unknown
121d7b39f1 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.


client/mysqldump.c:
  fix query to make dump restorable
2006-10-05 00:56:06 +10: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
unknown
78f47b1b10 Bug#19660 mysqldump --single-transaction should be with CONSISTENT SNAPSHOT
client/mysqldump.c:
  Bug#19660 mysqldump --single-transaction should be with CONSISTENT SNAPSHOT
  
  - Remove old BEGIN syntax and replace with START TRANSATION. Add CONSISTENT SNAPSHOT option for servers that support it.
2006-10-03 11:26:50 -04: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
unknown
a5d82874a7 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1


client/mysqldump.c:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
mysql-test/t/ndb_multi.test:
  Manual merge
2006-09-23 08:45:26 +02: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
unknown
c441c64e98 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
mysql-test/r/mysqldump.result:
  Restoring rpl tree mysqldump test file to main tree test files
mysql-test/r/status.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Restoring rpl tree mysqldump test file to main tree test files
2006-09-21 00:23:20 +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
unknown
edbab3578b Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
client/mysqldump.c:
  Merge main->rpl
mysql-test/r/mysqldump.result:
  Restore of main mysqldump test files in rpl tree (only added echo and one test case for bug 13926)
  Printouts not yet added to result file
mysql-test/t/mysqldump.test:
  Restore of main mysqldump test files in rpl tree (only added echo and one test case for bug 13926)
2006-09-21 00:05:56 +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
unknown
080efad84e Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20809


client/mysqldump.c:
  Auto merged
2006-09-20 17:23:46 +10: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
unknown
2038b98e46 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073


client/mysqldump.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2006-09-19 18:36:18 +10: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
unknown
11d3c64f67 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.


client/mysqldump.c:
  parse the EXTRA field of INFORMATION_SCHEMA.FILES to determine the UNDO_BUFFER_SIZE
2006-09-19 17:07:21 +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
unknown
6434e35270 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.


client/mysqldump.c:
  dump logfile groups correctly (ignore row for the log file group itself)
mysql-test/r/ndb_dd_dump.result:
  update results with new row for log file groups
sql/ha_ndbcluster.cc:
  for fill_files_table:
  - set null bits properly
  - add rows for log file groups with free undo space.
sql/sql_show.cc:
  make most I_S.FILES columns nullable to better fit with reality.
2006-09-19 01:44:32 +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
unknown
f2783c9217 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
client/mysqldump.c:
  Merge main->rpl
mysql-test/r/variables.result:
  Merge main->rpl
mysql-test/t/disabled.def:
  Merge main->rpl
mysql-test/t/mysqldump.test:
  Merge main->rpl
2006-09-15 01:46:47 +02: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
unknown
2c168ec568 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
client/mysqldump.c:
  Merge main->rpl
mysql-test/r/mysqldump.result:
  Merge main->rpl
mysql-test/t/mysqldump.test:
  Merge main->rpl
2006-09-15 01:26:28 +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
unknown
2bc96e39fc Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my50-bug21424
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my51-bug21424


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
2006-09-14 14:57:11 -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
unknown
0aa344f3f3 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.


client/mysqldump.c:
  When the flush-privileges command line option is specified, make sure to FLUSH PRIVILEGES after only the mysql database's tables' data is restored so that grant tables are current.
mysql-test/r/mysqldump.result:
  Added Results.
mysql-test/t/mysqldump.test:
  Expanded existing test case for bug 21527 to also test for bug 21424. 
  Exercises new --flush-priviliges command line option.
  Test ignores log tables.
2006-09-14 14:56:14 -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
unknown
1fff863add Merge neptunus.(none):/home/msvensson/mysql/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqldump.c:
  Auto merged
2006-09-12 15:38:02 +02: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
unknown
797bdc9b93 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


sql/sql_yacc.yy:
  Auto merged
client/mysqldump.c:
  Manual merge (rpl 5.0 -> rpl 5.1)
mysql-test/r/mysqldump.result:
  Manual merge (rpl 5.0 -> rpl 5.1)
mysql-test/t/mysqldump.test:
  Manual merge (rpl 5.0 -> rpl 5.1)
2006-09-11 17:14:40 +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
unknown
83e0c9d153 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge (main -> rpl 5.0)
mysql-test/t/mysqldump.test:
  Manual merge (main -> rpl 5.0)
2006-09-11 13:17:51 +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
unknown
30eaa0b19c Fix problem with windows where stderr is not flushed until end of program.
client/mysqldump.c:
  fflush stderr after writing to it.
2006-09-01 13:53:43 +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
unknown
6a20f7431a 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.


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Resolve conflict (probably wrong)
mysql-test/t/mysqldump.test:
  Resolve conflicts, make sure all tests new to 5.1 come after 'End of 5.0 tests'
2006-08-31 21:02:17 -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
unknown
55c61a6ea6 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.


client/mysqldump.c:
  Restore fix for bug 21215 accidently removed during merge
mysql-test/r/mysqldump.result:
  Update results
mysql-test/t/mysqldump.test:
  Fix order of tests so that all the tests new to the 5.0 tree come after
  "End of 4.1 tests", and so that each leaves things in the state it found
  them (particularly by returning to the 'test' database. Also remove some
  tests that were duplicated.
2006-08-31 20:53:34 -07:00