1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-08 17:02:21 +03:00
Commit Graph

1527 Commits

Author SHA1 Message Date
92ffe8cf0d Bug #16753 DD: mysqldump does not support Cluster Disk Data backups 2006-02-02 10:56:04 +01:00
e319fb893b Bug #16753 DD: mysqldump does not support Cluster Disk Data backups
mysql-test/r/ndb_dd_dump.result:
  New BitKeeper file ``mysql-test/r/ndb_dd_dump.result''
mysql-test/t/ndb_dd_dump.test:
  New BitKeeper file ``mysql-test/t/ndb_dd_dump.test''
2006-02-02 00:52:58 +01:00
8c024b9072 Bug #16753 DD: mysqldump does not support Cluster Disk Data backups 2006-02-02 00:52:58 +01:00
f7a6e24934 Fix mysqldump crash when encountering a VIEW (when used against a
5.0 or later server, obviously). (Bug #16389)


client/mysqldump.c:
  Prevent dumping data from a view (and crashing when we see one)
2006-02-01 12:28:39 -08:00
970aa54bd6 Fix mysqldump crash when encountering a VIEW (when used against a
5.0 or later server, obviously). (Bug #16389)
2006-02-01 12:28:39 -08:00
ad5ac3f897 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


client/mysqldump.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2006-01-16 18:09:04 +01:00
ae3d815b41 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-16 18:09:04 +01:00
848235f797 Merge BUG#15110 from 5.0 into 5.1.
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into  mysql.com:/home/alik/MySQL/devel/5.1-bug15110


BitKeeper/etc/ignore:
  auto-union
client/mysqldump.c:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/type_time.result:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
client/Makefile.am:
  Add my_user.c
include/Makefile.am:
  Add my_user.c
libmysqld/Makefile.am:
  Add my_user.c
mysql-test/t/disabled.def:
  Enable type_time.test
sql/sql_parse.cc:
  Merge.
2006-01-13 19:09:27 +03:00
b1705ae5c4 Merge BUG#15110 from 5.0 into 5.1.
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into  mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 19:09:27 +03:00
d4d29edb83 Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
There are two main idea of this fix:
  - introduce a common function for server and client to split user value
    (<user name>@<host name>) into user name and host name parts;
  - dump DEFINER clause in correct format in mysqldump.


BitKeeper/etc/ignore:
  added client/my_user.c libmysqld/my_user.c sql/my_user.c
client/Makefile.am:
  Use my_user.c in linking of mysqldump executable.
client/mysqldump.c:
  Fix for BUG#15110(mysqldump --triggers: does not include DEFINER clause)
include/Makefile.am:
  Add my_user.c
include/mysql_com.h:
  Introduce a constant for max user length.
libmysqld/Makefile.am:
  Add my_user.c
mysql-test/r/mysqldump.result:
  Update result file.
sql-common/Makefile.am:
  Add my_user.c
sql/Makefile.am:
  Add my_user.c
sql/sp.cc:
  Use constant for max user length.
sql/sp_head.cc:
  Use common function to parse user value.
sql/sql_acl.cc:
  Use constant for max user length.
sql/sql_parse.cc:
  Use constant for max user length.
sql/sql_show.cc:
  Use constant for max user length.
sql/sql_trigger.cc:
  Use constant for max user length.
include/my_user.h:
  A header file for parse_user().
sql-common/my_user.c:
  A new file for parse_user() implementation.
2006-01-11 02:07:40 +03:00
b04b851ef9 Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
There are two main idea of this fix:
  - introduce a common function for server and client to split user value
    (<user name>@<host name>) into user name and host name parts;
  - dump DEFINER clause in correct format in mysqldump.
2006-01-11 02:07:40 +03:00
307c0b77a1 many warnings (practically safe but annoying) corrected
client/mysqladmin.cc:
  don't use the handler after it's closed
client/mysqlbinlog.cc:
  memory leak
client/mysqldump.c:
  many "ignore return value" warnings, one "NULL dereference"
cmd-line-utils/libedit/history.c:
  memory leak
include/my_base.h:
  cleanup
libmysql/libmysql.c:
  "return value ignored" warning
myisam/mi_delete.c:
  "return value ignored" warning
myisam/myisampack.c:
  "out-of-bound access" warning
myisam/sort.c:
  "double free" warning
mysys/default_modify.c:
  "double free" warning
mysys/mf_iocache2.c:
  "return value ignored" warnings
mysys/my_bitmap.c:
  s/return/DBUG_RETURN/
mysys/my_error.c:
  memory leak
server-tools/instance-manager/parse.cc:
  "NULL dereference" warning
sql-common/client.c:
  "NULL dereference" warning
sql/field.cc:
  deadcode, "NULL dereference", "uninitialized" warnings
sql/field.h:
  unused parameters removed from constructor
sql/ha_myisam.cc:
  "return value ignored" warnings
sql/item.cc:
  "return value ignored" warnings
  changed constructor
sql/item_func.cc:
  "return value ignored" warnings
sql/log_event.cc:
  uninitialized warning
sql/opt_range.cc:
  "double free" and uninitialized warnings
sql/opt_range.h:
  "return value ignored" warning
sql/repl_failsafe.cc:
  "return value ignored" warning
sql/set_var.cc:
  "return value ignored" warning
sql/slave.cc:
  "return value ignored" warnings
sql/slave.h:
  new prototype
sql/sql_acl.cc:
  deadcode and "NULL dereference" warnings
sql/sql_db.cc:
  "return value ignored" warning
sql/sql_handler.cc:
  "NULL dereference" warning
sql/sql_help.cc:
  "NULL dereference" warning
sql/sql_insert.cc:
  "return value ignored" warning
sql/sql_parse.cc:
  "return value ignored" warning
  one more DBUG_ASSERT
sql/sql_repl.cc:
  "return value ignored" and memory leak warnings
sql/sql_show.cc:
  "return value ignored" and "NULL dereference"  warnings
sql/sql_test.cc:
  "return value ignored" warning
sql/table.cc:
  memory leak
sql/uniques.cc:
  "return value ignored" warning
  endspaces deleted
2006-01-03 17:54:54 +01:00
14f94dc0ca many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
69e0cc6d41 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


client/mysql.cc:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
isam/isamchk.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Merged from 4.0.
2005-12-04 15:34:47 +02:00
d88d8081da Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-12-04 15:34:47 +02:00
60f2e7a9a4 A set of Netware related patches.
client/mysql.cc:
  Fixed option name.
client/mysqladmin.c:
  Fixed option name.
client/mysqlbinlog.cc:
  Fixed option name.
client/mysqlcheck.c:
  Fixed option name.
client/mysqldump.c:
  Fixed option name.
client/mysqlimport.c:
  Fixed option name.
client/mysqlshow.c:
  Fixed option name.
isam/isamchk.c:
  Fixed option name.
myisam/myisamchk.c:
  Fixed option name.
myisam/myisampack.c:
  Fixed option name.
sql/sql_parse.cc:
  Fix problem with kill connection on NetWare.
2005-12-04 15:02:06 +02:00
669a12fdb0 A set of Netware related patches. 2005-12-04 15:02:06 +02:00
15a1774eec Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean


client/mysqldump.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Fix conflict
mysql-test/t/mysqldump.test:
  Fix conflict
2005-12-01 15:14:51 -08:00
01ac5172dd Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2005-12-01 15:14:51 -08:00
3016ec15be Merge mysql.com:/home/jimw/my/mysql-4.1-13318
into  mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Resolve conflicts
mysql-test/t/mysqldump.test:
  Resolve conflicts
2005-12-01 12:21:29 -08:00
beed6147ad Merge mysql.com:/home/jimw/my/mysql-4.1-13318
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-01 12:21:29 -08:00
f967d43ce2 Merge mysql.com:/usr/home/bar/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.1-new


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-11-29 09:30:29 +04:00
23c4c3abc0 Merge mysql.com:/usr/home/bar/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.1-new
2005-11-29 09:30:29 +04:00
c6cf4beedb Fixed typo where I did --replace-names intead of --replace.
Thanks Paul for pointing it out :)


client/mysqldump.c:
  Oops, obvious typo aye? Should hae had --replace not --replace-names
2005-11-28 19:44:55 -08:00
22183f2342 Fixed typo where I did --replace-names intead of --replace.
Thanks Paul for pointing it out :)
2005-11-28 19:44:55 -08:00
b34c9cfb0f Merge mysql.com:/home/jimw/my/mysql-4.1-5792
into  mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysql.cc:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
2005-11-28 10:52:52 -08:00
5f7e5b46c6 Merge mysql.com:/home/jimw/my/mysql-4.1-5792
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-28 10:52:52 -08:00
d6a1a3a51c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/mysql-5.1-new


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  REsolve
mysql-test/t/mysqldump.test:
  Resolve conflict
2005-11-24 11:23:44 -08:00
802f32c1dd Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/mysql-5.1-new
2005-11-24 11:23:44 -08:00
b0b86ec10b Its funny, I am reading through the forums and someone asks "Can I please have a REPLACE INTO, instead an INSERT INTO?" and I remember how often I have used a sed script to modify MySQL dumps to have exactly that.
So, use --replace and instead of getting INSERT INTO you will INSTEAD get REPLACE INTO. Buyer beward, REPLACE is a MySQL SQL, so you will not end up with a dump that can be used for other databases.

Though I hear you could just use a sed line to modify it back :)


client/client_priv.h:
  New option for --replace
client/mysqldump.c:
  Added option for REPLACE INTO instead of INSERT INTO
mysql-test/r/mysqldump.result:
  Updated REsultes for replace into
mysql-test/t/mysqldump.test:
  Added new test for --replace
2005-11-24 09:56:40 -08:00
33076b8782 Its funny, I am reading through the forums and someone asks "Can I please have a REPLACE INTO, instead an INSERT INTO?" and I remember how often I have used a sed script to modify MySQL dumps to have exactly that.
So, use --replace and instead of getting INSERT INTO you will INSTEAD get REPLACE INTO. Buyer beward, REPLACE is a MySQL SQL, so you will not end up with a dump that can be used for other databases.

Though I hear you could just use a sed line to modify it back :)
2005-11-24 09:56:40 -08:00
eb92d6a1e3 Fix values printed by mysqldump for empty blob fields when
--hex-blob is used. (Bug #13318)


client/mysqldump.c:
  Don't use 0x... syntax for empty fields.
mysql-test/r/mysqldump.result:
  Add new results
mysql-test/t/mysqldump.test:
  Add new regression test
2005-11-23 17:31:44 -08:00
000d89b5e0 Fix values printed by mysqldump for empty blob fields when
--hex-blob is used. (Bug #13318)
2005-11-23 17:31:44 -08:00
ac5159a86a Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0


client/mysqldump.c:
  Auto merged
2005-11-21 18:31:36 +01:00
84bc725fb9 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-11-21 18:31:36 +01:00
3ecbc8e66e Fixed BUG #14554: mysqldump does not separate "ROW" and trigger
statement for tables created in the IGNORE_SPACE sql mode.


client/mysqldump.c:
  Modified dump_triggers_for_table(): if trigger statement returned
   by SHOW TRIGGERS query does not contain a leading white space,
   additional space is inserted between "ROW" and the statement.
   The leading white spaces are removed by yylex() in the
   IGNORE_SPACE sql mode.
mysql-test/r/mysqldump.result:
  Fixed test case result for bug 14554.
mysql-test/t/mysqldump.test:
  Added test case for bug 14554.
2005-11-21 13:36:48 +03:00
9a7efe36c6 Fixed BUG #14554: mysqldump does not separate "ROW" and trigger
statement for tables created in the IGNORE_SPACE sql mode.
2005-11-21 13:36:48 +03:00
e8885320dd Netware specific changes for 5.0.16a
client/mysql.cc:
  Fixed option.
client/mysqladmin.cc:
  Fixed option.
client/mysqlbinlog.cc:
  Fixed option.
client/mysqlcheck.c:
  Fixed option.
client/mysqldump.c:
  Fixed option.
client/mysqlimport.c:
  Fixed option.
client/mysqlshow.c:
  Fixed option.
configure.in:
  Changed version for Netware.
myisam/myisamchk.c:
  Fixed option.
myisam/myisampack.c:
  Fixed option.
netware/mysql_test_run.c:
  NetWare specific changes:
  Define MYSQL_CHECK environment variable to make mysqlcheck test case pass
2005-11-18 18:25:46 +01:00
a50cc250ff Netware specific changes for 5.0.16a 2005-11-18 18:25:46 +01:00
2b35ab1245 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  frost.snake.net:/Users/paul/bk/mysql-5.0


client/mysqldump.c:
  Auto merged
2005-10-28 14:26:22 -05:00
19544bd01c Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  frost.snake.net:/Users/paul/bk/mysql-5.0
2005-10-28 14:26:22 -05:00
fd0ed478d3 Add DROP TABLE before trying to create view (in mysqldump)
Cleaned up xxxx_gis.test's and made gis_generic.inc independent of ndb
(Note that archive_gis.test fails, but this is independent of this patch)


client/mysqldump.c:
  Add DROP TABLE to be able to re-run mysqldump if it fails after 'table-named-as-view' is created
mysql-test/include/gis_generic.inc:
  Remove dependency of ndb
mysql-test/include/have_archive.inc:
  Fix syntax
mysql-test/include/have_geometry.inc:
  Fix syntax
mysql-test/r/mysqldump.result:
  New test results after adding 'drop table'
mysql-test/t/archive_gis.test:
  gis_generic tests for have_geometry.inc
mysql-test/t/bdb_gis.test:
  gis_generic tests for have_geometry.inc
mysql-test/t/innodb_gis.test:
  gis_generic tests for have_geometry.inc
mysql-test/t/ndb_gis.test:
  gis_generic tests for have_geometry.inc
sql/item_func.cc:
  Simplify code (as signal_divide_by_null sets 'null_value')
2005-10-27 22:45:18 +03:00
a9b1ff4095 Add DROP TABLE before trying to create view (in mysqldump)
Cleaned up xxxx_gis.test's and made gis_generic.inc independent of ndb
(Note that archive_gis.test fails, but this is independent of this patch)
2005-10-27 22:45:18 +03:00
9cee62af2f Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  frost.snake.net:/Users/paul/bk/mysql-5.0


client/mysqldump.c:
  Auto merged
2005-10-25 12:50:03 -05:00
ea8ab2a114 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  frost.snake.net:/Users/paul/bk/mysql-5.0
2005-10-25 12:50:03 -05:00
cecdc15a0d This cset fixes BUG# 12838, 14061, 12129
mysqldump.result:
  BUG# 12838
      New test results for mysqldump -x on a DB with views
mysqldump.test:
  sqldump.test:
      BUG# 12838
      New test to run mysqldump -x on a DB with views
mysqldump.c:
  BUG# 12838
      Removed/Changed code which created tables to be put into the dump
      (For loading views of views) by creating temp tables and then using
      the CREATE TABLE information in those temp tables. The problem with this
      is that when mysqldump -x is called, it locks all tables, so the
      temp tables could not be created, causing the mysqldump to exit with
      failure. The code was changed to use SHOW FIELDS to get the column
      names and type to build CREATE TABLE text used to create these tables
      that views need in the dump.


client/mysqldump.c:
  BUG# 12838
      Removed/Changed code which created tables to be put into the dump
      (For loading views of views) by creating temp tables and then using
      the CREATE TABLE information in those temp tables. The problem with this
      is that when mysqldump -x is called, it locks all tables, so the
      temp tables could not be created, causing the mysqldump to exit with
      failure. The code was changed to use SHOW FIELDS to get the column
      names and type to build CREATE TABLE text used to create these tables
      that views need in the dump.
mysql-test/t/mysqldump.test:
  sqldump.test:
      BUG# 12838
      New test to run mysqldump -x on a DB with views
mysql-test/r/mysqldump.result:
  BUG# 12838
      New test results for mysqldump -x on a DB with views
2005-10-25 19:04:31 +02:00
feca138e46 This cset fixes BUG# 12838, 14061, 12129
mysqldump.result:
  BUG# 12838
      New test results for mysqldump -x on a DB with views
mysqldump.test:
  sqldump.test:
      BUG# 12838
      New test to run mysqldump -x on a DB with views
mysqldump.c:
  BUG# 12838
      Removed/Changed code which created tables to be put into the dump
      (For loading views of views) by creating temp tables and then using
      the CREATE TABLE information in those temp tables. The problem with this
      is that when mysqldump -x is called, it locks all tables, so the
      temp tables could not be created, causing the mysqldump to exit with
      failure. The code was changed to use SHOW FIELDS to get the column
      names and type to build CREATE TABLE text used to create these tables
      that views need in the dump.
2005-10-25 19:04:31 +02:00
c69cea4bf4 mysqldump.c:
Slight change to help message.


client/mysqldump.c:
  Slight change to help message.
2005-10-19 14:40:10 -05:00
5d2c1d4cc2 mysqldump.c:
Slight change to help message.
2005-10-19 14:40:10 -05:00
75184ffa66 Changeset:
Changed option text in mysqldump.c
mysqldump.c:
  Changed text to read "+00:00" as opposed to "UTC" (per what the code does)


client/mysqldump.c:
  Changed text to read "+00:00" as opposed to "UTC" (per what the code does)
2005-10-18 18:51:07 -07:00