ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						f402871a5e 
					 
					
						
						
							
							Print a dummy section in order not to interference  
						
						 
						
						... 
						
						
						
						with /etc/my.cnf and ~/.my.cnf [client] section. 
						
						
					 
					
						2005-09-13 16:41:39 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						8a296476c0 
					 
					
						
						
							
							BUG#10713 mysqldump includes database in create view and referenced tables  
						
						 
						
						... 
						
						
						
						- Update test results
 - Updates after review 
						
						
					 
					
						2005-09-13 12:43:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						15d48525af 
					 
					
						
						
							
							Merge mysql.com:/home/my/mysql-4.1  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-07-28 17:09:54 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3c12d0ae54 
					 
					
						
						
							
							Added end marker for tests to make future merges easier  
						
						 
						
						
						
						
					 
					
						2005-07-28 03:22:47 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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) 
							
						 
					 
					
						
						
							
						
						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