Satya B
							
						 
					 | 
					
						
						
							
						
						57f7f1fdf3
					 | 
					
						
						
							
							Merge Innodb Plugin 1.0.6 from mysql-5.1-bugteam storage/innodb_plugin to mysql-trunk-merge.
						
						
						
						
						
						
						
						Merging revisions 3221 to 3230 from mysql-5.1-bugteam 
						
						
					 | 
					
						2009-12-02 19:30:50 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Vojtovich
							
						 
					 | 
					
						
						
							
						
						2cd0b2f373
					 | 
					
						
						
							
							Updates for test cases from innodb-zip-ss6129.
						
						
						
						
						
						
					 | 
					
						2009-11-05 17:23:50 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Vojtovich
							
						 
					 | 
					
						
						
							
						
						842c568d2a
					 | 
					
						
						
							
							Applying InnoDB snashot 5.1-ss6129
						
						
						
						
						
						
						
						Detailed revision comments:
r6122 | jyang | 2009-10-30 05:18:38 +0200 (Fri, 30 Oct 2009) | 7 lines
branches/5.1: Chnage WARN_LEVEL_ERROR to WARN_LEVEL_WARN
for push_warning_printf() call in innodb.
Fix Bug#47233: Innodb calls push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)
rb://170 approved by Marko. 
						
						
					 | 
					
						2009-11-02 18:59:44 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Satya B
							
						 
					 | 
					
						
						
							
						
						a0e12ec269
					 | 
					
						
						
							
							Merging Innodb plugin 1.0.5 revisions from 5.1-main from revisions 3149 to 3163
						
						
						
						
						
						
						
						also merged missing Innodb plugin revisions r5636,r5635 manually 
						
						
					 | 
					
						2009-10-16 17:28:02 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Satya B
							
						 
					 | 
					
						
						
							
						
						37e4f861ed
					 | 
					
						
						
							
							Applying InnoDB snapshot 5.1-ss5921, part 2. Fixes BUG#44369
						
						
						
						
						
						
						
						BUG#44369 - InnoDB: Does not uniformly disallow disallowed column names
Detailed revision comments:
r5741 | jyang | 2009-09-03 07:16:01 +0300 (Thu, 03 Sep 2009) | 5 lines
branches/5.1: Block creating table with column name conflicting
with Innodb reserved key words. (Bug #44369) rb://151 approved
by Sunny Bains.
r5760 | jyang | 2009-09-04 07:07:34 +0300 (Fri, 04 Sep 2009) | 3 lines
branches/5.1: This is to revert change 5741. A return status for
create_table_def() needs to be fixed.
r5834 | jyang | 2009-09-11 00:43:05 +0300 (Fri, 11 Sep 2009) | 5 lines
branches/5.1: Block creating table with column name conflicting
with Innodb reserved key words. (Bug #44369) rb://151 approved
by Sunny Bains. 
						
						
					 | 
					
						2009-10-05 16:47:48 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |