Commit graph

227 commits

Author SHA1 Message Date
msvensson@pilot.blaudden
a5045ace69 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-19 20:31:01 +01:00
msvensson@pilot.blaudden
1e9e0f4e74 Remove extra ; at end of line 2007-02-19 20:30:34 +01:00
msvensson@pilot.blaudden
3359145790 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-19 18:25:55 +01:00
msvensson@pilot.blaudden
bcb7521b0e Remove unportable constructs in mysqldump.test 2007-02-19 18:25:42 +01:00
lars@black.(none)
d85ca0dc1d Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-12-08 23:41:29 +01:00
lars@mysql.com/black.(none)
e2e3f0e5c3 Merge mysql.com:/home/bkroot/mysql-5.0-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-12-08 23:33:39 +01:00
msvensson@shellback.(none)
7ddc43e305 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-29 15:44:09 +01:00
monty@nosik.monty.fi
38a92caeb7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-11-21 23:12:45 +02:00
monty@mysql.com/nosik.monty.fi
f6682e2743 Added --debug-info to most clients to detect memory leaks in mysql-test-run
Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
2006-11-21 22:32:58 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
e396432904 Preparing to merge "backport of bug#13926 into 5.0"
Moving tests to 4.1 section
2006-11-21 12:22:10 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
78c74b0396 Prepare to merge "backport of bug#13926 from 5.0 to 4.1" back into 5.0:
Moving tests into their new place into 4.1 tests section
2006-11-21 12:09:14 +04:00
msvensson@neptunus.(none)
9f22fecf72 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-15 10:31:23 +01:00
msvensson@neptunus.(none)
15c3ed7517 Cleanup after test cases 2006-11-15 10:23:27 +01:00
iggy@rolltop.ignatz42.dyndns.org
b61c3a7361 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my50-bug19745
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my51-bug19745
2006-10-18 18:48:02 -04:00
iggy@rolltop.ignatz42.dyndns.org
3c31c84200 Bug#19745: mysqldump --xml produces invalid xml
The mysqldump command with both the --xml and --hex-blob options will output blob data encoded as hexBinary.  
The proper XML datatype is xs:hexBinary.  
The correct XML datatype is specified be setting the xsi_type attribute equal to xs:hexBinary for each encoded element.
2006-10-18 18:43:51 -04:00
lars/lthalmann@mysql.com/dl145j.mysql.com
bc8207c9b8 Result file fixes after merge 2006-09-21 02:39:47 +02:00
lars/lthalmann@dl145j.mysql.com
0f85f6f760 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-21 00:53:47 +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
lars/lthalmann@mysql.com/dl145k.mysql.com
dd410b3f77 Merge fixes, added printout to result file 2006-09-15 03:02:01 +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
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
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
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
iggy@rolltop.ignatz42.dyndns.org
5de6240a93 Post merge changes. 2006-08-28 21:13:55 -04:00
iggy@rolltop.ignatz42.dyndns.org
76bf7c81ae Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_21527
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_21527
2006-08-28 20:41:22 -04:00
iggy@rolltop.ignatz42.dyndns.org
bfe86ca448 Bug #21527 mysqldump incorrectly tries to LOCK TABLES on the information_schema database.
init_dumping now accepts a function pointer to the table or view specific init_dumping function.  This allows both tables and views to use the init_dumping function.
2006-08-28 17:48:06 -04:00
jimw@rama.(none)
abc148000d Bug #21288: mysqldump segmentation fault when using --where
The problem was that the error handling was using a too-small buffer to
  print the error message generated. We fix this by not using a buffer at
  all, but by using fprintf() directly. There were also some problems with
  the error handling in table dumping that was exposed by this fix that were
  also corrected.
2006-08-17 14:09:24 -07:00
brian@zim.(none)
16a5d97a5d Merge fixes 2006-08-14 16:50:52 -07:00
brian@zim.(none)
8deb5beb9c Merge zim.(none):/home/brian/mysql/dep-5.0
into  zim.(none):/home/brian/mysql/dep-5.1
2006-08-14 15:24:29 -07:00
kostja@bodhi.local
d03b39aaab Fix a test case (proper clean up). 2006-08-14 19:18:33 +04:00
kostja@bodhi.local
5dfdc8bfce Manual merge 5.0->5.1. Post-merge fixes. 2006-08-14 13:27:11 +04:00
kostja@bodhi.local
04c97488f9 Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-12 21:06:51 +04:00
andrey@example.com
eba9109225 after merge update 2006-08-10 11:52:34 +02:00
tsmith@maint1.mysql.com
b9ac526884 5.0 -> 5.1 manual merge, part 5 of 5 (or more?) 2006-08-03 19:27:00 +02:00
msvensson@neptunus.(none)
b9b2ef9cfb Make test case for bug#21215repeateble by calling "reset master" 2006-08-03 16:47:24 +02:00
msvensson@neptunus.(none)
743948404a Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21215
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-08-03 11:48:08 +02:00
tsmith@maint1.mysql.com
242ed711d2 5.0 -> 5.1 manual merge, part 1 of 3 (or more?) 2006-08-03 10:04:25 +02:00
grog@eucla.lemis.com
90c9c72605 BUG#13926: --order-by-primary fails if PKEY contains quote character.
Quote PKEY.
2006-08-02 11:26:08 +09:30
jimw@rama.(none)
69f9fe7531 Fix tests after merge and disable rpl_ndb_dd_advance due to bug 18679. 2006-07-28 19:39:34 -07:00
jimw@rama.(none)
f7e19b40f3 Merge rama.(none):/home/jimw/my/tmp_merge
into  rama.(none):/home/jimw/my/mysql-5.1-clean
2006-07-28 15:51:48 -07:00
kostja@bodhi.local
73189969f3 Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-07-26 23:33:25 +04:00
msvensson@neptunus.(none)
c84cdbf40b Bug#21215 mysqldump creating incomplete backups without warning
- Add call to 'safe_exit' function when db query fails.
2006-07-24 13:10:24 +02:00
tnurnberg@salvation.intern.azundris.com
199bb148fd Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-release
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-merge
2006-07-19 14:12:30 +02:00
iggy@rolltop.ignatz42.dyndns.org
ad12809f35 Bug# 20221- Dumping of multiple databases containing view(s) yields maleformed dumps. 2006-07-17 18:07:08 -04:00
tnurnberg@mysql.com/salvation.intern.azundris.com
00ec3973f7 Bug#21014: Segmentation fault of mysqldump on view
mysqldump did not select the correct database before trying to dump
views from it. this resulted in an empty result set, which in turn
startled mysql-dump into a core-dump.  this only happened for views,
not for tables, and was only visible with multiple databases that
weren't by sheer luck in the order mysqldump required, anyway. this
fixes by selecting the correct database before dumping views; it also
catches the empty set-condition if it should occur for other reasons.
2006-07-14 12:50:00 +02:00
tnurnberg@mysql.com/salvation.intern.azundris.com
4316f715d3 Bug#21014: Segmentation fault of mysqldump on view
mysqldump did not select the correct database before trying to dump
views from it. this resulted in an empty result set, which in turn
startled mysql-dump into a core-dump.  this only happened for views,
not for tables, and was only visible with multiple databases that
weren't by sheer luck in the order mysqldump required, anyway. this
fixes by selecting the correct database before dumping views; it also
catches the empty set-condition if it should occur for other reasons.
2006-07-14 01:25:13 +02:00
kostja@bodhi.local
96f4c10dde Cleanups: ignore more files. 2006-07-08 00:03:43 +04:00