msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						2e232feb7d 
					 
					
						
						
							
							Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050622184432|37770  
						
						
						
						
					 
					
						2005-06-22 20:45:20 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						2d0b93f955 
					 
					
						
						
							
							Will do cset -x on this.  
						
						
						
						
					 
					
						2005-06-22 20:44:32 +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) 
							
						 
					 
					
						
						
							
						
						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)[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 
							
						 
					 
					
						
						
							
						
						3f6aad900c 
					 
					
						
						
							
							Resolve merge from 4.1  
						
						
						
						
					 
					
						2005-05-18 11:06: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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						5865330a9e 
					 
					
						
						
							
							Merge embedded server testing changes from 4.1.  
						
						
						
						
					 
					
						2005-04-01 19:17:15 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						16efc3e333 
					 
					
						
						
							
							Merge embedded-server testing changes.  
						
						
						
						
					 
					
						2005-04-01 16:43:35 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						690183d1a0 
					 
					
						
						
							
							Eliminate most of the remaining hardcoded list of tests to skip  
						
						... 
						
						
						
						by adding check for embedded server within tests and splitting some
tests into multiple test files. 
						
						
					 
					
						2005-03-29 17:17:46 -08: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 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						b94a482ee9 
					 
					
						
						
							
							Precision Math implementation  
						
						
						
						
					 
					
						2005-02-09 02:50:45 +04: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 
							
						 
					 
					
						
						
							
						
						b236841890 
					 
					
						
						
							
							Take charsets from the source directory rather than  
						
						... 
						
						
						
						from the install directory. 
						
						
					 
					
						2004-12-23 13:52:25 +04: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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3a24c279be 
					 
					
						
						
							
							Fix results (becasue of strict mode)  
						
						
						
						
					 
					
						2004-10-07 16:18:27 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						bdf696d0a4 
					 
					
						
						
							
							fixed bug  #2705  "mysqldump --tab extra output"  
						
						
						
						
					 
					
						2004-02-14 01:21:46 +04:00 
						 
				 
			
				
					
						
							
							
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						fd03264469 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2004-02-10 18:56:43 +04:00