database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-03 14:33:32 +03:00
Code Activity
46,939 Commits 3,253 Branches 1,092 Tags
016bff8adcc2332772b51f8dbdc5a3d926f5a04c
Commit Graph

518 Commits

Author SHA1 Message Date
monty@nosik.monty.fi
89570bf966 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-22 14:11:36 +02:00
monty@mysql.com/nosik.monty.fi
e825879800 Remove compiler warnings 
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
 2006-11-20 22:42:06 +02:00
mskold/marty@linux.site
6ad1b4f92c Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-11-10 11:38:54 +01:00
stewart@willster.(none)
8f3ac043e8 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20839
 2006-10-26 21:29:27 +10:00
msvensson@neptunus.(none)
e8881843a9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-24 15:46:54 +02:00
msvensson@neptunus.(none)
26183402d1 Use same type for local variables as arguments, avoid compile error on NetWare 2006-10-24 13:52:50 +02:00
stewart@willster.(none)
910e4d974c BUG#20839 Illegal error code: 155 returned downgrading from 5.1.12-> 5.1.11 
post-review fixups - magnus suggested creating dynstr_trunc instead of doing
it manually.
 2006-10-20 22:47:28 +10:00
iggy@rolltop.ignatz42.dyndns.org
2ec5a57ff4 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my51-bug19745 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-10-18 19:28:37 -04:00
iggy@rolltop.ignatz42.dyndns.org
39bda9e3cf Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my50-bug19745 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-10-18 19:27:14 -04: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
cmiller@zippy.cornsilk.net
184467a2cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-10-17 11:23:07 -04:00
stewart@willster.(none)
49124e987c BUG#20839 Illegal error code: 155 returned downgrading from 5.1.12-> 5.1.11 
post-review fixes.

Magnus suggested use of DYNAMIC_STRING instead of futzing with c strings.
also making usage of TABLEs clearer in store_schema_partitions_record.
 2006-10-17 01:02:12 +10:00
stewart@willster.(none)
c1a8b8daa7 BUG#20839 Illegal error code: 155 returned downgrading from 5.1.12-> 5.1.11 
Post review fix:
Magnus suggested making sure that new mysqldump still worked flawlessly
with old servers.
 2006-10-17 00:15:58 +10:00
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
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
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
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
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
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
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
iggy@rolltop.ignatz42.dyndns.org
728588da38 Bug#19660 mysqldump --single-transaction should be with CONSISTENT SNAPSHOT 2006-10-03 11:26:50 -04: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
msvensson@neptunus.(none)
10a7b8cedf Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-03 12:11:07 +02:00
msvensson@neptunus.(none)
61c5d97309 Remove double error printout in mysqldump 2006-08-03 12:09:22 +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