Commit graph

108 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
d612caf39a Merge neptunus.(none):/home/msvensson/mysql/bug10713
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
2005-09-13 09:41:01 +02:00
ramil@mysql.com
c4ea0e2bf8 merging 2005-09-12 12:09:44 +05:00
patg@radha.local
a237d20152 BUG #12597 after merge, needed to produce results 2005-09-10 01:50:39 +02:00
patg@radha.local
f41aa04b59 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597
2005-09-10 01:50:38 +02:00
ramil@mysql.com
9730b5369a A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries). 2005-09-09 12:51:43 +05:00
patg@radha.local
06d1582b98 BUG #12597 This is a complete patch (2nd) containing fixes per Serg's review 2005-09-09 00:03:07 +02:00
patg@radha.local
4cb63e6b8b BUG #9056 Changes to patch #2 per Serg's review 2005-09-08 19:45:25 +02:00
patg@radha.local
03183c70c0 BUG #9056 Added --routines flag to mysqldump to enable mysqldump to be able
to dump PROCEDURES and FUNCTIONS.
2005-09-04 01:34:58 +02:00
msvensson@neptunus.(none)
1efa3714aa Bug10213 mysqldump crashes when dumping VIEWs
- Added testcase for this bug
 - Check if compact view format can be used
 - Clean up mysqld_show_create
2005-09-01 11:36:42 +02:00
bell@sanja.is.com.ua
ec3396aab3 postmerge-fix 2005-07-30 09:24:51 +03:00
bell@sanja.is.com.ua
4a0d64af89 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0
2005-07-29 23:43:07 +03:00
bell@sanja.is.com.ua
36f250a240 Added sql_mode saving to mysql_dump (BUG#5891, part 2) 2005-07-29 23:39:08 +03:00
monty@mysql.com
ef1de7da1d After merge fixes 2005-07-28 21:39:24 +03:00
patg@radha.local
8d671d7bca Applied and tested this patch successfully (bug 10431) to a clean
tree on brian's amd 64 box (which was already approved). 

[patg@zim mysql-5.0]$ bk changes
ChangeSet@1.1882, 2005-07-21 18:43:55+05:00, gluh@eagle.intranet.mysql.r18.ru
  merge fix

Was the changeset level I applied this patch to.

Master shutdown finished
Slave shutdown finished
All 326 tests were successful.

[patg@zim mysql-5.0]$
2005-07-22 04:11:45 +02:00
jimw@mysql.com
060a53ab25 Update test results 2005-07-05 18:23:55 -07:00
msvensson@neptunus.(none)
ba2a0328d1 Tests readded for bug 10927 2005-06-30 20:44:31 +02:00
msvensson@neptunus.(none)
bf3449074f Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050630172241|15421 2005-06-30 19:24:34 +02:00
msvensson@neptunus.(none)
4fd33dd2b6 Should not be here, same procedure every time.. 2005-06-30 19:22:41 +02:00
msvensson@neptunus.(none)
5dfa2a014a Merge fixes 2005-06-22 20:49:58 +02:00
msvensson@neptunus.(none)
8018f99ce7 Merging 2005-06-22 20:43:10 +02:00
msvensson@neptunus.(none)
01b025c2d2 Fix so that my_progname is set to "mysqldump" 2005-06-22 20:37:14 +02:00
msvensson@neptunus.(none)
8e9c7a42df Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-22 20:24:10 +02:00
msvensson@neptunus.(none)
2dd6a58d58 BUG#9657 mysqldump xml ( -x ) does not format NULL fields correctly
- Importing the bug fixes by patch due to merge problems.
2005-06-22 20:22:54 +02:00
msvensson@neptunus.(none)
1199b4ec9d Fix mysqldump for so that my_programname is set to "mysqldump".
Correct test results now when error message output is predictable.
2005-06-22 20:12:21 +02:00
msvensson@neptunus.(none)
9258513c1e Bug #9558 mysqldump --no-data db t1 t2 format still dumps data
- Check the Dflag variable inside of function dump_table to see if data should be
dumped or not.
    - Add test for --xml and --no-data as well
    Reapplying patch!
2005-06-22 15:43:49 +02:00
msvensson@neptunus.(none)
fd82fd86bc Merge to 5.0 2005-06-22 15:32:05 +02:00
msvensson@neptunus.(none)
94e37bc3fc Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050622121209|37729 2005-06-22 14:16:26 +02:00
msvensson@neptunus.(none)
777e1d785c Should not be changed 2005-06-22 14:12:09 +02:00
msvensson@neptunus.(none)[msvensson]
39636f48f0 patch 2005-06-21 14:19:56 +02:00
msvensson@neptunus.(none)
a152d29117 Bug #9558 mysqldump --no-data db t1 t2 format still dumps data
- Added testcases according to spec in bug report.
2005-06-10 16:26:23 +02:00
joerg@mysql.com
9504bd0ddd Manual merge. 2005-05-26 12:51:44 +02:00
brian@zim.(none)
6182241268 Additions for --add-drop-database 2005-05-20 06:56:02 -07:00
jimw@mysql.com
d5ee234917 Fixes to merge from 4.1 2005-05-18 15:40:34 -07:00
jimw@mysql.com
9ef20027a6 Update mysqldump test and results 2005-05-18 09:40:12 -07:00
jimw@mysql.com
79ce5dcd90 Resolve bugfix merge 2005-05-18 09:25:06 -07:00
gbichot@quadita2.mysql.com
56dbfc99ba mysqldump.c: disabling --delayed-insert until BUG#7815 is fixed (need table def cache for that,
to easily check the storage engine supports DELAYED).
2005-05-18 13:02:09 +02:00
lenz@mysql.com
5cdf15a919 - added "--skip-comments" to the "mysqldump" test to avoid printing comments that include
version-dependent information (which causes test failures when running the test with a
  different version string)
2005-05-09 09:25:47 +02:00
ramil@ram-book.(none)
2d21a31b60 Brian's mysqldump test modifications made on Ramil's laptop. 2005-05-09 12:21:19 +05:00
brian@zim.(none)
8636468466 Merge 2005-05-08 16:19:06 -07:00
jimw@mysql.com
e2a11cc15e Fix crash in mysqldump -c triggered by tables with a large number of long
field names. (Bug #10286)
2005-05-08 12:02:46 -07:00
brian@brian-akers-computer.local
39f4e5755d Patch for --insert-ignore 2005-05-07 09:49:39 -07:00
ramil@mysql.com
12d14eb96c Test case (bug #9756: mysql client failing on dumps containing certain \ sequences). 2005-04-26 15:48:16 +05:00
dlenev@brandersnatch.localdomain
f169114042 WL#874 "Extended LOAD DATA".
Now one can use user variables as target for data loaded from file
(besides table's columns). Also LOAD DATA got new SET-clause in which
one can specify values for table columns as expressions.

For example the following is possible:
LOAD DATA INFILE 'words.dat' INTO TABLE t1 (a, @b) SET c = @b + 1;

This patch also implements new way of replicating LOAD DATA.
Now we do it similarly to other queries.
We store LOAD DATA query in new Execute_load_query event
(which is last in the sequence of events representing LOAD DATA).
When we are executing this event we simply rewrite part of query which
holds name of file (we use name of temporary file) and then execute it
as usual query. In the beggining of this sequence we use Begin_load_query
event which is almost identical to Append_file event
2005-03-16 04:32:47 +03:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
Sinisa@sinisa.nasamreza.org
172294e92e Fix to make builds possible 2005-03-08 20:06:08 +02:00
Sinisa@sinisa.nasamreza.org
5da6cd551d Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-03-07 16:23:41 +02:00
Sinisa@sinisa.nasamreza.org
79ac22e324 A fix for a bug #8830, which occured when binary data from blob was
dumped with --hex-blob and --skip-extended-insert options.
2005-03-05 22:06:07 +02:00
dlenev@mysql.com
5b16dbf960 Manual merge SP-locking improvements patch with current tree. 2005-03-04 17:46:45 +03:00
dlenev@brandersnatch.localdomain
5a6c7027f0 Better approach for prelocking of tables for stored routines execution
and some SP-related cleanups.

- We don't have separate stage for calculation of list of tables
  to be prelocked and doing implicit LOCK/UNLOCK any more.
  Instead we calculate this list at open_tables() and do implicit
  LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
  Also now we support cases when same table (with same alias) is
  used several times in the same query in SP.

- Cleaned up execution of SP. Moved all common code which handles
  LEX and does preparations before statement execution or complex
  expression evaluation to auxilary sp_lex_keeper class. Now 
  all statements in SP (and corresponding instructions) that
  evaluate expression which can contain subquery have their
  own LEX.
2005-03-04 16:35:28 +03:00
jimw@mysql.com
f7c01cfb76 Merged from 4.1 2005-03-03 15:01:46 -08:00