Merge bk-internal.mysql.com:/home/bk/mysql-5.0 (d8fa9819) · Commits · Software / OSDI20 Artifacts / mariadb

client/mysqldump.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -342,7 +342,7 @@ static struct my_option my_long_options[] =
		{"result-file", 'r',
		"Direct output to a given file. This option should be used in MSDOS, because it prevents new line '\\n' from being converted to '\\r\\n' (carriage return + line feed).",
		0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
		{"routines", 'R', "Dump routines FUNCTIONS and PROCEDURES.",
		{"routines", 'R', "Dump stored routines (functions and procedures).",
		(gptr) &opt_routines, (gptr) &opt_routines, 0, GET_BOOL,
		NO_ARG, 0, 0, 0, 0, 0, 0},
		{"set-charset", OPT_SET_CHARSET,

+1 −4

Original line number	Diff line number	Diff line
		@@ -118,15 +118,12 @@ extern "C" {
		/* do not use the extended time in LibC sys\stat.h */
		#define _POSIX_SOURCE

		/* Kernel call on NetWare that will only yield if our time slice is up */
		void kYieldIfTimeSliceUp(void);

		/* Some macros for portability */

		#define set_timespec(ABSTIME,SEC) { (ABSTIME).tv_sec=time(NULL)+(SEC); (ABSTIME).tv_nsec=0; }

		/* extra protection against CPU Hogs on NetWare */
		#define NETWARE_YIELD kYieldIfTimeSliceUp()
		#define NETWARE_YIELD pthread_yield()
		/* Screen mode for help texts */
		#define NETWARE_SET_SCREEN_MODE(A) setscreenmode(A)

+26 −0

Original line number	Diff line number	Diff line
		@@ -115,3 +115,29 @@ select * from t1 procedure analyse (1,1);
		Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
		test.t1.d 100000 100000 6 6 0 0 100000 0 MEDIUMINT(6) UNSIGNED NOT NULL
		drop table t1;
		create table t1 (product varchar(32), country_id int not null, year int,
		profit int);
		insert into t1 values ( 'Computer', 2,2000, 1200),
		( 'TV', 1, 1999, 150),
		( 'Calculator', 1, 1999,50),
		( 'Computer', 1, 1999,1500),
		( 'Computer', 1, 2000,1500),
		( 'TV', 1, 2000, 150),
		( 'TV', 2, 2000, 100),
		( 'TV', 2, 2000, 100),
		( 'Calculator', 1, 2000,75),
		( 'Calculator', 2, 2000,75),
		( 'TV', 1, 1999, 100),
		( 'Computer', 1, 1999,1200),
		( 'Computer', 2, 2000,1500),
		( 'Calculator', 2, 2000,75),
		( 'Phone', 3, 2003,10)
		;
		create table t2 (country_id int primary key, country char(20) not null);
		insert into t2 values (1, 'USA'),(2,'India'), (3,'Finland');
		select product, sum(profit),avg(profit) from t1 group by product with rollup procedure analyse();
		Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
		test.t1.product Computer TV 2 8 0 0 4.2500 NULL ENUM('Computer','Phone','TV') NOT NULL
		sum(profit) 10 6900 2 4 0 0 1946 2868 ENUM('10','275','600','6900') NOT NULL
		avg(profit) 10.0000 1380.0000 7 9 0 0 394.6875 570.2003 ENUM('10.0000','68.7500','120.0000','1380.0000') NOT NULL
		drop table t1,t2;

+13 −0

Original line number	Diff line number	Diff line
		@@ -641,3 +641,16 @@ create table if not exists t1 (a int);
		Warnings:
		Note 1050 Table 't1' already exists
		drop table t1;
		create table t1 (
		a varchar(112) charset utf8 collate utf8_bin not null,
		primary key (a)
		) select 'test' as a ;
		Warnings:
		Warning 1364 Field 'a' doesn't have a default value
		show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`a` varchar(112) character set utf8 collate utf8_bin NOT NULL,
		PRIMARY KEY (`a`)
		) ENGINE=MyISAM DEFAULT CHARSET=latin1
		drop table t1;

+6 −0

Original line number	Diff line number	Diff line
		@@ -170,6 +170,12 @@ insert into t1 values (1);
		select rand(i) from t1;
		ERROR HY000: Incorrect arguments to RAND
		drop table t1;
		create table t1 (a varchar(90), ts datetime not null, index (a)) engine=innodb default charset=utf8;
		insert into t1 values ('http://www.foo.com/', now());
		select a from t1 where a='http://www.foo.com/' order by abs(timediff(ts, 0));
		a
		http://www.foo.com/
		drop table t1;
		set sql_mode='traditional';
		select ln(-1);
		ln(-1)