Commit graph

294 commits

Author SHA1 Message Date
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
bar@mysql.com
4a9176b418 Bugs: #8063: make test mysqldump [ fail ]
See mysqldump.test diff for more details
2005-03-03 15:43:00 +04:00
lars@mysql.com
e330e2698d After merge fixes 2005-02-23 00:50:30 +01:00
lars@mysql.com
7271a6014f Merge 4.1->5.0 2005-02-22 22:40:34 +01:00
lars@mysql.com
1d3c67000b BUG#6662: Changes after Guilhems and Sergs review 2005-02-22 12:40:31 +01:00
lars@mysql.com
be28ef0a20 BUG#6662: Importing mysqldumps should not show any warnings of level "notes". 2005-02-21 18:40:28 +01:00
hf@deer.(none)
b94a482ee9 Precision Math implementation 2005-02-09 02:50:45 +04:00
jimw@mysql.com
6056009782 Update test results after bug-fix merge. 2005-01-31 17:31:42 -08:00
jimw@mysql.com
b7dda3f7c0 Merge 2005-01-31 16:27:17 -08:00
jimw@mysql.com
f95f820727 Fix test results for mysqldump test. Part of Bug #8148. 2005-01-28 12:13:01 -08:00
monty@mysql.com
2299e1eca4 Better handling of ensuring that setup_tables() are not called twice
This fixed a bug in prepared statements when used with outher joins
Fixed a bug in SUM(DISTINCT) when used with prepared statements.
Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests
2005-01-03 21:04:33 +02:00
serg@sergbook.mysql.com
a9c7fb9dfd post-merge 2004-12-31 17:59:43 +01:00
serg@sergbook.mysql.com
a04fc26c54 manually merged 2004-12-31 15:26:24 +01:00
lars@mysql.com
967fac4ef6 WL#2319 V2: Exclude tables from dump
- Added a hash to keep track of database-table pairs.
- Specified database-table tables do not get dumped
2004-12-27 19:10:30 +01:00
bar@mysql.com
e53b446a73 Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
See mysqldump.test comments for more details
2004-12-22 16:02:27 +04:00
monty@mysql.com
77207d19f2 Merge with new VARCHAR code 2004-12-06 19:18:35 +02:00
monty@mysql.com
67ce247965 Add support for up to VARCHAR (size up to 65535)
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
2004-12-06 02:00:37 +02:00
brian@avenger.(none)
b85f4677d5 Merge for Matt for Innodb bug. 2004-11-30 10:10:40 -08:00
ram@gw.mysql.r18.ru
3f741570e9 An additional test for 'CREATE DATABASE' with non-default character set. 2004-11-30 13:19:35 +04:00
ram@gw.mysql.r18.ru
ece5c9f293 A fix (bug #6101: mysqldump writes invalid SQL). 2004-10-19 11:00:44 +05:00
bell@sanja.is.com.ua
ca7a4e495f changes in SHOW CREATE VIEW output 2004-10-07 23:26:26 +03:00
monty@mishka.local
76a315410b After merge fixes 2004-10-05 03:05:20 +03:00
bell@sanja.is.com.ua
3bddaaf80f fix test suite for portability 2004-09-28 12:31:33 +03:00
bell@sanja.is.com.ua
ff102adddf fix xml with view 2004-09-26 19:00:55 +03:00
serg@serg.mylan
fc234f2e4c Bug#4261 - mysqldump omits NULLs with --skip-extended-insert 2004-06-23 21:46:17 +02:00
bar@bar.intranet.mysql.r18.ru
d04966e380 Sorry, forgot to commit together with the code change yesterday. 2004-06-08 11:33:16 +05:00
monty@mishka.local
e9cfe01db0 After merge fixes
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'
2004-04-27 15:33:40 +03:00
monty@mishka.local
21fd1d270e Merge with 4.0 2004-04-26 15:53:31 +03:00
vva@eagle.mysql.r18.ru
7b68b26623 fixed Bug #3361 "mysqldump quotes DECIMAL values" 2004-04-05 23:18:16 +05:00
serg@serg.mylan
ded8fa56eb my_strtod fixes:
sigsegv protection (exp overflow)
don't return inf!
use errno=EOVERFLOW to signal an overflow (as my_strntod uses errno anyway)
if errno will be too slow, my_strtod can be changed to return overflow status in a parameter (like my_strntod does)
2004-03-14 17:25:20 +01:00
vva@eagle.mysql.r18.ru
0be2ef688c merge correcttion in mysql-test/r/mysqldump.result 2004-03-11 22:43:10 +04:00
vva@eagle.mysql.r18.ru
bb6aee84ef Merge 2004-03-11 22:01:25 +04:00
vva@eagle.mysql.r18.ru
3c1ba83296 fixed bug #2591 "mysqldump quotas names inconsistently" 2004-03-11 18:46:27 +04:00
vva@eagle.mysql.r18.ru
a8bbcc52a9 - added commands --query_vertical and --query_horisontal to client/mysqltest.cc
- get my_strtod to return inf
- get Field_float::store(double) and Field_double::store(float) to set null for 
nan value 
(as extra serg's recomendations to fix for patch on 
 Bug #2082 'mysqldump converts "inf" to null')
2004-03-06 03:00:21 +04:00
vva@eagle.mysql.r18.ru
9585dd63df Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2705/mysql-4.1
2004-02-15 21:35:05 +04:00
vva@eagle.mysql.r18.ru
bdf696d0a4 fixed bug #2705 "mysqldump --tab extra output" 2004-02-14 01:21:46 +04:00
vva@eagle.mysql.r18.ru
c57ca85da5 fixed mistake after merge in mysql-test/r/mysqldump.result 2004-02-13 01:50:02 +04:00
vva@eagle.mysql.r18.ru
950b2df9f7 correcting mysql-test/r/mysqldump.result after merge 2004-02-10 19:29:28 +04:00
vva@eagle.mysql.r18.ru
fd03264469 Merge 2004-02-10 18:56:43 +04:00
monty@mysql.com
06432eac36 Added --compact to mysqlbinlog
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned
2004-02-09 12:31:03 +01:00
vva@eagle.mysql.r18.ru
cc1ff3c479 fixed bug #2592 mysqldump doesn't quote "tricky" names correctly 2004-02-07 02:22:12 +04:00
acurtis@pcgem.rdg.cyberkinetica.com
d0d54abcf2 Bug#2634
Emit "TYPE=" for 4.0 and 3.23 compatible modes
2004-02-05 02:30:28 +00:00
bell@sanja.is.com.ua
b781183f09 mysqldump results fixed 2004-01-17 12:03:14 +02:00
monty@mysql.com
031390a9a4 Fixes after merge with 4.0
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
2003-12-19 16:25:50 +02:00
monty@mysql.com
e0cc6799ec Merge with 4.0.17 2003-12-17 17:35:34 +02:00
monty@mysql.com
b24671ee2d Updated results 2003-12-15 18:10:46 +01:00
monty@mysql.com
217226f9af Portablity fix 2003-12-14 21:31:02 +01:00
ram@gw.mysql.r18.ru
0395a3dd46 Added --comments mysqldump option (default value is 1).
Fixed mysqldump test.
2003-12-11 17:37:45 +04:00
ram@gw.mysql.r18.ru
9698e236ab Disable some tests until replace can handle regexp 2003-12-11 13:50:47 +04:00
ram@gw.mysql.r18.ru
007fea7203 proper musqldump test result
(in addition to CS 1.1623 03/12/09)
2003-12-10 18:41:13 +04:00
ram@gw.mysql.r18.ru
7576f1a81f changed usc2 -> koi8r to don't depend on extra-charset option. 2003-12-10 15:27:33 +04:00
ram@gw.mysql.r18.ru
4d1f521f21 Fix for the bug #1994: mysqldump does not correctly dump UCS2 data. 2003-12-09 15:28:58 +04:00
ram@gw.mysql.r18.ru
f277c9f88a Portability fix (for example NetWare doesn't support table name like t"1"). 2003-11-05 12:06:03 +04:00
ram@gw.mysql.r18.ru
3dba5c6cc1 WL #1279: Add table description to xml dump
changes after montys review
2003-11-03 16:49:39 +04:00
ram@gw.mysql.r18.ru
de9d246548 Fixes for mysql tests. 2003-10-31 16:37:36 +04:00
ram@gw.mysql.r18.ru
906ad716cc new mysqldump -X test (bug #1707) 2003-10-31 11:29:57 +04:00
monty@mashka.mysql.fi
a3707408e8 Update results after merge 2003-10-16 08:16:39 +03:00
ram@gw.mysql.r18.ru
5e07599ebe #1169: Add --exec command to mysqltest 2003-09-24 16:13:47 +05:00
ram@gw.mysql.r18.ru
28c92200fb Test for mysqldump 2003-09-19 14:02:49 +05:00