bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8d05911df0 
					 
					
						
						
							
							Merge abarkov@build.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1 
						
						
					 
					
						2003-09-15 14:48:23 +05:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						f55b05e2cf 
					 
					
						
						
							
							In CREATE syntax: KEY a (field_name(10))  
						
						... 
						
						
						
						10 now means "number of characters", not number of bytes. 
						
						
					 
					
						2003-09-15 14:45:42 +05:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						10c962bd41 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1 
						
						
					 
					
						2003-09-15 11:43:11 +03:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						9a5e82ad64 
					 
					
						
						
							
							type_nchar.result:  
						
						... 
						
						
						
						I forgot to push it in the previous changeset. 
						
						
					 
					
						2003-09-15 12:48:34 +05:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						eca64292e6 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1 
						
						
					 
					
						2003-09-15 10:35:52 +03:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						1726b4d89e 
					 
					
						
						
							
							New syntax:  
						
						... 
						
						
						
						CREATE TABLE t1(a NVARCHAR(10))
This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.
Note, standard SQL doesn't have "NVARCHAR" syntax.
There are only these syntaxes in SQL2003:
 NATIONAL VARCHAR
 NCHAR VARCHAR
 NATIONAL CHARACTER VARYING 
 NCHAR VARYING
- Tests were added for all the above syntaxes. 
						
						
					 
					
						2003-09-15 10:26:48 +05:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						6d62d31049 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/dlenev/src/mysql-4.1-868 
						
						
					 
					
						2003-09-14 17:19:53 +04:00 
						 
				 
			
				
					
						
							
							
								dlenev@dlenev.mshome 
							
						 
					 
					
						
						
							
						
						f7a4d682d5 
					 
					
						
						
							
							Post merge fixes. Fixed tests after adding UNTIL conditions  
						
						... 
						
						
						
						to SHOW SLAVE STATUS. 
						
						
					 
					
						2003-09-14 17:18:38 +04:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						46b8c3ea8b 
					 
					
						
						
							
							renamed join_types (as was suggested by Peter Gulutzan)  
						
						
						
						
					 
					
						2003-09-14 09:40:57 +03:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						2c24b2e9b4 
					 
					
						
						
							
							Manual merge after commiting START SLAVE UNTIL  
						
						
						
						
					 
					
						2003-09-14 01:57:09 +04:00 
						 
				 
			
				
					
						
							
							
								dlenev@dlenev.mshome 
							
						 
					 
					
						
						
							
						
						c0cfae1c8d 
					 
					
						
						
							
							Implemented support for START SLAVE UNTIL (WL#868)  
						
						
						
						
					 
					
						2003-09-14 00:13:41 +04:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						cde0c36962 
					 
					
						
						
							
							Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into sinisa.nasamreza.org:/mnt/work/mysql-4.1 
						
						
					 
					
						2003-09-13 20:00:42 +03:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						a26847c275 
					 
					
						
						
							
							Fixes for OPTION_FOUND_ROWS in UNION's  
						
						
						
						
					 
					
						2003-09-13 19:56:58 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						d4b5b879bd 
					 
					
						
						
							
							"normal" warning in test suite disabled  
						
						... 
						
						
						
						bad merge fixed 
						
						
					 
					
						2003-09-13 16:05:17 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						0088e1c657 
					 
					
						
						
							
							Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into sinisa.nasamreza.org:/mnt/work/mysql-4.1 
						
						
					 
					
						2003-09-12 19:23:47 +03:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						a424ccee17 
					 
					
						
						
							
							Fix for a bug  #1231  
						
						... 
						
						
						
						Parse error caused global ORDER BY to be initialized although it should
not have been. 
						
						
					 
					
						2003-09-12 19:17:30 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						c477002fd4 
					 
					
						
						
							
							Fix results for mix_innodb_myisam_binlog  
						
						... 
						
						
						
						Optimize calls to current_thd 
						
						
					 
					
						2003-09-12 05:54:12 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						04c43fca8e 
					 
					
						
						
							
							Optimize thai character handling  
						
						... 
						
						
						
						Remove sel000xxxx tests
After merge fixes 
						
						
					 
					
						2003-09-12 04:18:07 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						7538242e4f 
					 
					
						
						
							
							merge with 4.1 tree  
						
						
						
						
					 
					
						2003-09-11 20:31:40 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						73f66f68fd 
					 
					
						
						
							
							merge with 4.0.15  
						
						
						
						
					 
					
						2003-09-11 20:24:14 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						45aa92c574 
					 
					
						
						
							
							After merge fixes.  
						
						... 
						
						
						
						Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code) 
						
						
					 
					
						2003-09-11 19:06:23 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						23ad0cfbbb 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1 
						
						
					 
					
						2003-09-10 09:43:30 +03:00 
						 
				 
			
				
					
						
							
							
								ram@mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						4b1c22c57e 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.r18.ru:/usr/home/ram/work/4.1 
						
						
					 
					
						2003-09-10 11:19:39 +05:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						a837b71e6c 
					 
					
						
						
							
							after merge fix  
						
						
						
						
					 
					
						2003-09-09 23:07:39 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						ad07ffbf6d 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2003-09-09 22:26:19 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						99490870e6 
					 
					
						
						
							
							Cleaned up last bug fixes  
						
						... 
						
						
						
						Fix bug in SHOW GRANTS when there is a column privilege but no table privilege 
						
						
					 
					
						2003-09-09 20:06:50 +03:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						5e32805713 
					 
					
						
						
							
							Fix for a bug  #1226 .  
						
						... 
						
						
						
						Happens when braces are used on a single select, which leads
to the uninitialized global parameters structure. 
						
						
					 
					
						2003-09-09 15:23:38 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						813d81c726 
					 
					
						
						
							
							removing additional IN subquery condition  
						
						... 
						
						
						
						fixed IN optimisation bug 
						
						
					 
					
						2003-09-08 21:58:09 +03:00 
						 
				 
			
				
					
						
							
							
								ram@mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						44d6102f81 
					 
					
						
						
							
							Fix for the bug  #1209 : SELECT DATABASE().  
						
						
						
						
					 
					
						2003-09-08 17:30:53 +05:00 
						 
				 
			
				
					
						
							
							
								ram@mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						0caa462b77 
					 
					
						
						
							
							#1169 : Add --exec command to mysqltest  
						
						
						
						
					 
					
						2003-09-08 10:53:51 +05:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						a02094ef10 
					 
					
						
						
							
							fixed row union processing  
						
						
						
						
					 
					
						2003-09-07 20:35:10 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						80565e1352 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mashka.mysql.fi:/home/my/mysql-tmp 
						
						
					 
					
						2003-09-07 15:14:32 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						045eb3d8fe 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.0  
						
						... 
						
						
						
						into mashka.mysql.fi:/home/my/mysql-4.0 
						
						
					 
					
						2003-09-05 17:06:36 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						75b2c4a62f 
					 
					
						
						
							
							Fixed rare bug in MYISAM introduced in 4.0.3 where the index file header was not updated directly after an UPDATE of split dynamic rows.  
						
						
						
						
					 
					
						2003-09-05 06:42:55 +03:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						548d7dc948 
					 
					
						
						
							
							Fix for bug 1176  
						
						
						
						
					 
					
						2003-09-04 17:12:20 +05:00 
						 
				 
			
				
					
						
							
							
								wax@kishkin.ru 
							
						 
					 
					
						
						
							
						
						b34c3934d9 
					 
					
						
						
							
							BUG  
						
						... 
						
						
						
						correct bug 1085 (a problem with min/max functions)
add tests of bugs 833,836,1085 
						
						
					 
					
						2003-09-04 06:44:16 +06:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						be96cc0984 
					 
					
						
						
							
							bug  #1172  - crash on force index() and SEL_ARG::MAYBE_KEY  
						
						
						
						
					 
					
						2003-09-03 22:27:04 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						4b3b4b9250 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2003-09-03 19:53:08 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						7d2b0a0ce7 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-4.1/  
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-4.1 
						
						
					 
					
						2003-09-03 15:40:19 +02:00 
						 
				 
			
				
					
						
							
							
								kostja@oak.local 
							
						 
					 
					
						
						
							
						
						424a647069 
					 
					
						
						
							
							post-merge fixes  
						
						
						
						
					 
					
						2003-09-03 16:43:41 +04:00 
						 
				 
			
				
					
						
							
							
								kostja@oak.local 
							
						 
					 
					
						
						
							
						
						36dd82c1d5 
					 
					
						
						
							
							merge commit, hope that none of bar and dlenev changes were  
						
						... 
						
						
						
						lost. 
						
						
					 
					
						2003-09-03 14:12:10 +04:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						755455e15c 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2003-09-03 12:07:18 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2fcab1c2ee 
					 
					
						
						
							
							CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]  
						
						
						
						
					 
					
						2003-09-03 11:34:32 +02:00 
						 
				 
			
				
					
						
							
							
								ram@mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						5e6d8dd7fe 
					 
					
						
						
							
							Fix for the bug  #971 : ORDER BY DESC doesn't return correct num of rows with BDB and an indexed column.  
						
						
						
						
					 
					
						2003-09-02 21:09:28 +05:00 
						 
				 
			
				
					
						
							
							
								dlenev@dlenev.mshome 
							
						 
					 
					
						
						
							
						
						f655ba9866 
					 
					
						
						
							
							Updated various tests results which were missed during auto-merge  
						
						... 
						
						
						
						with replication over SSL patch. 
						
						
					 
					
						2003-09-01 19:13:19 +04:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						de627fde80 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-4.0/  
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-4.0 
						
						
					 
					
						2003-09-01 14:59:56 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						b2c83e7f03 
					 
					
						
						
							
							workaround for IN's special treatment of first argument. Not for 4.1  
						
						
						
						
					 
					
						2003-09-01 14:18:27 +02:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						73ab4be246 
					 
					
						
						
							
							Manual merge fixes  
						
						
						
						
					 
					
						2003-09-01 16:14:54 +04:00 
						 
				 
			
				
					
						
							
							
								dlenev@dlenev.mshome 
							
						 
					 
					
						
						
							
						
						2486222cd2 
					 
					
						
						
							
							Implemented replication over SSL  
						
						... 
						
						
						
						Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
 Honoring this parameters during connection to master.
 Introduced new format of master.info file 
						
						
					 
					
						2003-09-01 15:16:20 +04:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						b0a8931986 
					 
					
						
						
							
							Two small fixes  
						
						
						
						
					 
					
						2003-08-30 18:21:24 +03:00