Commit graph

499 commits

Author SHA1 Message Date
wax@mysql.com
136c2d3104 Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4rw 2003-01-30 21:15:21 +05:00
bell@sanja.is.com.ua
9525a58132 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1
2003-01-29 19:46:11 +02:00
bar@bar.mysql.r18.ru
735399a850 Move latin1 into a separarte file 2003-01-29 17:31:20 +04:00
bell@sanja.is.com.ua
d39a2c0afc Merge 2003-01-28 15:34:59 +02:00
bell@sanja.is.com.ua
0c5b323d0f fixed bugs in temporary tables in subselect implementation (SCRUM)
merging with switching on static tables optimization (SCRUM)
fixed subselects with uncacheable results
added test for fixed bugs from bugreports
2003-01-28 14:48:12 +02:00
hf@deer.mysql.r18.ru
6bca9b7034 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-default
2003-01-28 12:59:07 +04:00
bar@bar.mysql.r18.ru
7e38aa4b19 sql_yacc.yy:
Semicolon has been added
2003-01-27 13:46:33 +04:00
serg@serg.mysql.com
2fd8380c0c making the keyword ROW for row items optional 2003-01-26 20:01:45 +01:00
monty@mashka.mysql.fi
fa7a94ed14 Added timeout for wait_for_master_pos
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
2003-01-25 15:07:51 +02:00
bell@sanja.is.com.ua
44d8a8cdab merging 2003-01-25 13:19:46 +02:00
bell@sanja.is.com.ua
d56e23f64e fixed subselects with temporary tables (SCRUM)
fixed memory leacks
2003-01-25 02:25:52 +02:00
hf@deer.mysql.r18.ru
524e33eb59 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-default
2003-01-22 20:51:54 +04:00
monty@mashka.mysql.fi
7436e9ec97 Merge 2003-01-21 21:28:51 +02:00
monty@mashka.mysql.fi
25c393a12e Portability fixes (for windows)
Some changes to the prepared statement protocol to make it easier to use and faster.
2003-01-21 21:07:59 +02:00
hf@deer.mysql.r18.ru
87681bb85e Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-default
2003-01-21 20:24:22 +04:00
hf@deer.mysql.r18.ru
9fb261e384 SCRUM
Default in UPDATE & SELECT
2003-01-21 20:20:46 +04:00
bell@sanja.is.com.ua
62c02d4b45 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-cols-4.1
2003-01-21 15:31:04 +02:00
Sinisa@sinisa.nasamreza.org
70dfa42258 resolve fix 2003-01-21 14:57:33 +02:00
bell@sanja.is.com.ua
372e2130e4 fixed test of cardinality 2003-01-21 13:55:26 +02:00
wax@mysql.com
272354b1a2 delete name_length and change an assign of udf.name (SCRUM) 2003-01-20 02:58:21 +05:00
monty@mashka.mysql.fi
8acc22296c Change client_flag to unsigned long (16 -> 32 bits) to handle more options.
Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows
2003-01-18 16:39:21 +02:00
monty@hundin.mysql.fi
1b03f00710 merge 2003-01-17 21:41:38 +02:00
Sinisa@sinisa.nasamreza.org
47d44c129e Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-01-17 14:09:44 +02:00
jani@rhols221.adsl.netsonic.fi
94cc7d751e Added support sql_mode, which can be used to produce various outputs
of SHOW CREATE TABLE 'name'. Depending on the mode, the output can
be compatible with various databases, including earlier versions of
MySQL
.
2003-01-16 02:04:50 +02:00
Sinisa@sinisa.nasamreza.org
3f30ccd85b Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-01-15 16:00:43 +02:00
bell@sanja.is.com.ua
9e9ea3504f after merging fixing 2003-01-14 18:00:34 +02:00
Sinisa@sinisa.nasamreza.org
8985c1d6cc Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-01-10 18:26:14 +02:00
venu@myvenu.com
045b2f2336 Remove/change unwanted variables in client protocol
Add missed mysql_stmt_affected_rows()
sql_yacc.yy : Fix the compilation error .. bison 1.75
2003-01-09 17:56:34 -08:00
monty@mashka.mysql.fi
c9dc5a206b Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2003-01-09 22:43:23 +02:00
monty@mashka.mysql.fi
bf683af4ce Post merge fix
Allow empty key list in USE|IGNORE|FORCE INDEX()
2003-01-09 22:42:31 +02:00
Sinisa@sinisa.nasamreza.org
15d1a71466 Fixes for usage of sub-selects in KILL and HANDLER ....
Approved by Sanja ... ;o)
2003-01-09 22:17:16 +02:00
monty@hundin.mysql.fi
5733c2acc9 Merge work:/home/bk/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1 2003-01-09 16:11:03 +02:00
wax@mysql.com
aeff9672f2 change structure of udf_func and parameter of functions mysql_drop_func and add_func (SCRUM) 2003-01-09 18:09:21 +05:00
bar@bar.mysql.r18.ru
a89df5a096 Separating CHARSET and COLLATION terms 2003-01-09 15:37:59 +04:00
monty@mashka.mysql.fi
f8e660d88c merge with 4.0.9
To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys
2003-01-09 03:55:26 +02:00
monty@mashka.mysql.fi
a101784930 Add TYPE as an alias for specifying key type 2003-01-09 03:12:17 +02:00
monty@mashka.mysql.fi
3c08da957e Don't count NULL values in cardinalty for MyISAM tables.
Free row buffer cache after each query for MyISAM tables.
Added table join option FORCE INDEX
Fixed core dump bug when connecting with hostname that could not be resolved.
2003-01-09 02:19:14 +02:00
bar@bar.mysql.r18.ru
952cb9b49a Renamed to look in common style 2003-01-08 16:29:31 +04:00
bar@bar.mysql.r18.ru
7e13f78acf COLLATE is field attribute not field type 2003-01-08 13:38:11 +04:00
monty@hundin.mysql.fi
cc1a522b8b Merge work:/home/bk/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1 2003-01-05 23:39:33 +02:00
hf@deer.mysql.r18.ru
445d426203 Conflicts resolving 2003-01-05 14:12:03 +04:00
hf@deer.mysql.r18.ru
f6e8e1f985 SCRUM
DEFAULT in UPDATE and SELECT
2003-01-05 14:07:24 +04:00
peter@mysql.com
3b425c8ba5 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2003-01-01 20:11:18 +03:00
bell@sanja.is.com.ua
2c6fca2755 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
2002-12-31 12:48:00 +02:00
peter@mysql.com
aa77916c30 Merge 2002-12-29 20:06:43 +03:00
bell@sanja.is.com.ua
2ed22eaba8 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
2002-12-29 18:41:58 +02:00
Sinisa@sinisa.nasamreza.org
a72d2a6db8 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-28 21:37:16 +02:00
Sinisa@sinisa.nasamreza.org
1e2bec8009 aliases with multi-table updates / deletes
fix for a bug with derived tables and query cache
ix for a charset bug in timestamp
2002-12-28 21:34:17 +02:00
venu@myvenu.com
2e0b01b315 sql_table.cc:
Fix CREATE LIKE TABLE .. temporary case
2002-12-28 01:38:29 -08:00
peter@mysql.com
333420e295 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-12-27 21:42:21 +03:00
peter@mysql.com
6bc97ffaee SCRUM
Add optional second parameter to password() function. It can be used to force password()
to return fixed values.
2002-12-27 19:47:23 +03:00
bell@sanja.is.com.ua
20232ada52 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
2002-12-27 17:14:33 +02:00
Sinisa@sinisa.nasamreza.org
5a44f2bc26 merge fixes 2002-12-26 20:04:22 +02:00
bell@sanja.is.com.ua
d85a01db2c added FROM DUAL for derived tables 2002-12-26 17:48:19 +02:00
Sinisa@sinisa.nasamreza.org
5988ae5ca5 Many fixes.
I still have to make a test case for :

UPDATE from sub-select with derived table
2002-12-24 13:58:07 +02:00
bell@sanja.is.com.ua
b63f230346 row IN subselects (SCRUM) 2002-12-19 21:15:09 +02:00
bar@bar.mysql.r18.ru
6ac401b550 thd_charset has been moved to variables structure 2002-12-19 09:38:28 +04:00
bar@bar.mysql.r18.ru
161fec7b8b New syntax
CREATE TABLE tname (a CHAR(10) COLLATE latin1_de)
2002-12-19 09:38:27 +04:00
bar@bar.mysql.r18.ru
9c94dea185 SAPDB-style syntax
CREATE TABLE tname (a CHAR(10) ASCII)
  as a synonym for
CREATE TABLE tname (a CHAR(10) CHARACTER SET latin1)
2002-12-19 09:38:26 +04:00
bar@bar.mysql.r18.ru
f7711e851b Introducing SAPDB-style
"fieldname CHAR(n) UNICODE"
as a synonym to
   "fieldname CHAR(n) CHARACTER SET ucs2"
2002-12-19 09:38:25 +04:00
Sinisa@sinisa.nasamreza.org
ab70ad7c1e Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-14 15:15:23 +02:00
vva@eagle.mysql.r18.ru
8eddd4d411 Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/VARIANCE/4.1.clone
2002-12-14 03:38:38 +04:00
vva@eagle.mysql.r18.ru
b624df724b add VARIANCE function 2002-12-14 03:36:59 +04:00
vva@eagle.mysql.r18.ru
7050b5eb4d add 'SOUNDS LIKE' syntax 2002-12-14 02:18:14 +04:00
pem@mysql.com
c180ae2e9b Fixed syntax error in sql_yacc.yy (with bison 1.75). 2002-12-13 16:38:52 +01:00
monty@mashka.mysql.fi
5022e56cba Ensure that BEGIN / COMMIT is handled properly if slave dies
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
2002-12-11 15:46:39 +02:00
Sinisa@sinisa.nasamreza.org
d8b4d6bd26 fix for a bug with UNION in sub-select's and start working on
UNION's in derived tables
2002-12-09 20:47:47 +02:00
pem@mysql.com
64e321d0df Made sql_yacc.yy work with bison 1.75. 2002-12-07 12:35:57 +01:00
monty@mashka.mysql.fi
f1d35b29bc merge fix 2002-12-06 21:15:05 +02:00
monty@mashka.mysql.fi
35ff08c2af After merge fixes
Added THD to add_to_xxx_list() functions for faster parsing.
2002-12-06 21:11:27 +02:00
bell@sanja.is.com.ua
f1858ec331 fixed bug of PROCEDURE in same query with subselects
prohibited using procedure inside subquery
fixed error handling of procedure analize
2002-12-06 00:40:28 +02:00
monty@mashka.mysql.fi
859b688476 Merge with 4.0.6 2002-12-05 19:38:42 +02:00
peter@mysql.com
1d920529a8 SCRAM Remove spaces from most changed files.
This alters not only my code so it looks like I'm not only one adding the spaces.
2002-12-05 01:14:51 +03:00
peter@mysql.com
5fa02daa69 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-12-04 16:26:29 +03:00
monty@hundin.mysql.fi
bfb2dc8886 Merge work:/home/bk/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1 2002-12-03 13:11:18 +02:00
serg@serg.mysql.com
564487d7c0 it's INSERT ... ON DUPLICATE KEY UPDATE , not INSERT ON DUPLICATE KEY UPDATE SET 2002-12-02 22:04:26 +01:00
serg@serg.mysql.com
e54134fde7 merged 2002-12-02 20:41:34 +01:00
serg@serg.mysql.com
2320923a7b INSERT ... ON DUPLICATE KEY UPDATE ... 2002-12-02 20:38:00 +01:00
monty@hundin.mysql.fi
e590b88858 Merge work:/home/bk/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1 2002-12-02 17:58:48 +02:00
pem@mysql.com
f9850fdc9c Got rid of the (previously) intentional SELECT/UNION reduce/reduce conflict.
There should be no more reduce/reduce conflicts in sql_yacc.yy from now on!
2002-12-01 17:10:13 +01:00
pem@mysql.com
fb2cd40a99 Merge work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pem/work/mysql-4.1
2002-12-01 16:03:42 +01:00
monty@hundin.mysql.fi
2df1b26210 Merge work:/home/bk/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1 2002-12-01 15:05:35 +02:00
monty@hundin.mysql.fi
b96041ffa8 Fixed that one can use in identifiers: CREATE TABLE fo`a ...
Added BOOLEAN as synonym for tinyint
2002-12-01 14:59:06 +02:00
peter@mysql.com
1bf744911f Megrge new changes in... 2002-12-01 11:18:19 +03:00
pem@mysql.com
621475a760 Fixed ambiguity between the row value syntax and INTERVAL syntax by making the
ROW keyword mandatory (although it's optional in SQL-99).
2002-11-30 19:33:01 +01:00
Sinisa@sinisa.nasamreza.org
a24b780207 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-30 19:54:52 +02:00
Sinisa@sinisa.nasamreza.org
a968d7c2ea many bug fixes 2002-11-30 18:46:24 +02:00
pem@mysql.com
6a8e2a9cbc Pass thd as an argument to yylex(). 2002-11-30 16:43:53 +01:00
peter@mysql.com
08f51eaedd Merging.... 2002-11-29 22:03:14 +03:00
serg@serg.mysql.com
87fbeb4098 let's leave "INSERT ... SELECT ... UPDATE" for the future 2002-11-29 16:17:52 +01:00
monty@mashka.mysql.fi
bd53a30858 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-11-29 16:41:12 +02:00
monty@mashka.mysql.fi
6603d75213 New multi-table-update code
New (simpler) internal timestamp handling.
More debuging to heap tables.
Small cleanups to multi-table-delete
false -> 0 and true -> 1  (We should use TRUE and FALSE)
2002-11-29 16:40:18 +02:00
serg@serg.mysql.com
fd11c80400 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-11-29 14:26:25 +01:00
serg@serg.mysql.com
c28e99c65a added missing Com_xxx status variables
moved SQLCOM_END to the end of the list
bad copy-paste in sql_yacc.yy fixed
2002-11-29 14:20:25 +01:00
serg@serg.mysql.com
409f7af3cf make multi updates statistics visible in SHOW STATUS as Com_update_multi 2002-11-29 13:17:54 +01:00
bell@sanja.is.com.ua
39ddd2dcb4 checking columns of top items 2002-11-29 12:30:04 +02:00
bell@sanja.is.com.ua
fcb0b8815b merging 2002-11-28 20:12:14 +02:00
bell@sanja.is.com.ua
c1527b6f4c Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
2002-11-28 20:04:09 +02:00
bell@sanja.is.com.ua
ec38595696 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-28 20:01:22 +02:00
pem@mysql.com
086bd41700 Added 29 {} at the end of clauses in sql_yacc.yy to make it work with bison 1.75. 2002-11-28 18:57:56 +01:00