Commit graph

1651 commits

Author SHA1 Message Date
monty@narttu.mysql.fi
e6c575dacc change 'slave-master-info.opt' to .slave-mi to avoid problems with long filenames on some OS 2003-02-26 00:04:13 +02:00
serg@serg.mysql.com
5878878717 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-02-25 21:31:17 +01:00
serg@serg.mysql.com
2e7b9ca09f fixed again 2003-02-25 21:20:22 +01:00
monty@narttu.mysql.fi
fe0aa9ff2a Portability fix 2003-02-25 22:20:17 +02:00
serg@serg.mysql.com
1ccc5944a0 fix a bug in the test 2003-02-25 20:37:49 +01:00
serg@serg.mysql.com
aaa768890b test updated 2003-02-24 21:25:09 +01:00
wax@mysql.com
dd7ecee561 Merge vkishkin@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/wax/mysql-4n
2003-02-24 23:54:58 +05:00
serg@serg.mysql.com
572e2a1568 tests updated 2003-02-22 18:22:39 +01:00
Sinisa@sinisa.nasamreza.org
8439a4949f merge fix 2003-02-22 17:14:50 +02:00
Sinisa@sinisa.nasamreza.org
bf3dabcce4 Allowing NULL values in UNION's with first SELECT having only NOT NULL
columns.
2003-02-22 17:02:36 +02:00
guilhem@mysql.com
e91a9c79ba Test's result update because std_data/words.dat has been lengthened by 500 bytes.
Increased some tests' robustness a bit :
- Added RESET MASTER to all tests who do SHOW BINLOG EVENTS, to make them independent from previous tests.
- Added save_master_pos to these tests to wait for the slave to start before purging its binary logs.
2003-02-21 23:38:56 +01:00
lenz@mysql.com
8a272349b9 Applied Sinisa's patch:
"A fix for non-releasing locks for multi table updates and multi
table deletes with InnoDB tables."
2003-02-19 15:08:29 +01:00
wax@mysql.com
45ada60304 add option default-week-format and variable default_week_format
(SCRUM)
2003-02-19 17:05:35 +05:00
bell@sanja.is.com.ua
1de8a5996f Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-qc-4.1
2003-02-18 16:28:31 +02:00
bell@sanja.is.com.ua
126e085749 Merge abelkin@work.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/mysql-4.0
2003-02-17 17:11:11 +02:00
monty@mashka.mysql.fi
90bf074438 Merge with 4.0.11 tree to get latest bug fixes 2003-02-17 05:43:37 +02:00
monty@mashka.mysql.fi
6051b2f998 Fixed multi-table-delete for InnoDB tables
Novell patches
2003-02-17 02:14:37 +02:00
Sinisa@sinisa.nasamreza.org
f2a8927db7 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-02-15 16:06:58 +02:00
bell@sanja.is.com.ua
e98e85315f fix of illegal usage aggregate functions 2003-02-15 00:11:00 +02:00
bell@sanja.is.com.ua
05bbea4b25 fixed invalidation of query cache on LOAD DATA 2003-02-14 22:20:38 +02:00
monty@mashka.mysql.fi
acf8993439 Fixed problem when connecting to user without a password.
Fixed problem with LIKE and BINARY
2003-02-14 11:47:41 +02:00
Sinisa@sinisa.nasamreza.org
5acf83802d fix a bug in derived tables
UNION's bug fixes and code clean-up
2003-02-13 17:56:01 +02:00
monty@mashka.mysql.fi
e327393e9d Fixed a lot of wrong memory references as reported by valgrind
Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.
2003-02-12 21:55:37 +02:00
monty@mashka.mysql.fi
15aee37456 merge 2003-02-10 18:01:29 +02:00
monty@mashka.mysql.fi
48558055ed Move tmp_table_used to THD
Optimize depending sub querys
Remove valgrind warnings
2003-02-10 17:59:16 +02:00
monty@mashka.mysql.fi
78e7230e73 Better fix for count(distinct) bug 2003-02-10 17:03:27 +02:00
serg@sergbook.mysql.com
cba78f827c count(distint) on an empty table crash fixed 2003-02-10 12:01:47 +01:00
monty@mashka.mysql.fi
c4e7cbe158 after merge fix 2003-02-08 02:09:21 +02:00
monty@mashka.mysql.fi
7388c5f161 merge 2003-02-08 01:12:58 +02:00
monty@mashka.mysql.fi
1b9b042654 Fix problem in MIN/MAX optimisation (from last patch)
Don't make OLD_PASSWORD() a reserved word
2003-02-07 17:57:07 +02:00
monty@mashka.mysql.fi
b14b246d38 Merge with 4.0 to get fix for MIN/MAX 2003-02-07 16:38:37 +02:00
monty@mashka.mysql.fi
25de9c19b2 After merge fixes & remove compiler warnings
Added lengths for all MYSQL_FIELD string parameters
Changed field length to 2 byte in .frm files
2003-02-07 15:47:24 +02:00
monty@mashka.mysql.fi
5ce55f27f8 Added test for SHOW CREATE 2003-02-07 12:54:10 +02:00
Sinisa@sinisa.nasamreza.org
c89c969b7c A fix for new conditions being defined and upper condition not updated 2003-02-06 18:50:12 +02:00
monty@mashka.mysql.fi
cf9668fd37 Added START TRANSACTION syntax
Added ALL as parameter option for all group functions.
Make join handling uniform. This allows us to use ',', JOIN and INNER JOIN the same way.
Sort NULL last if DESC is used (ANSI SQL 99 requirement)
2003-02-06 16:55:59 +02:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
monty@mashka.mysql.fi
59400e211f Fixed bug in ulonglong parsing for constructs that only takes unsigned longlong as parameter. 2003-02-04 01:05:39 +02:00
monty@mashka.mysql.fi
3d067e7d73 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-03 20:22:43 +02:00
monty@mashka.mysql.fi
e3cd63521c Fix for MIN/MAX with empty tables
MIN(key_column) could in some cases return NULL on a column with NULL and other values.
MIN(key_column) and MAX(key_column) could in some cases return wrong values when used in OUTER JOIN.
2003-02-03 20:20:32 +02:00
serg@serg.mysql.com
f47e5501e7 bug tests added 2003-02-03 09:17:47 +01:00
bell@sanja.is.com.ua
291f8a225a Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1
2003-02-02 17:39:27 +02:00
gluh@gluh.mysql.r18.ru
8d3c43880d conflicts resolving 2003-01-31 09:43:53 +04:00
bell@sanja.is.com.ua
e294751c41 fixed bug in determinating uncacheable queries
new fatal_error interface to assign is_fatal_error and ne.report_error
commant about Item_row
2003-01-30 22:15:44 +02:00
gluh@gluh.mysql.r18.ru
57a805de6c 'Replicate user variables' task 2003-01-30 21:39:54 +04:00
bell@sanja.is.com.ua
5ed5dac01b cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation 2003-01-30 14:35:07 +02:00
bell@sanja.is.com.ua
a662f7e105 fixed row items with group functions
fixed layout
2003-01-29 20:44:47 +02:00
bell@sanja.is.com.ua
214036a7f6 improving of fields list creation in derived tables and unions
fixed length of fields created in fubselect
fixed resolving fields of reduced in derived table subselect
2003-01-29 19:42:39 +02:00
monty@mashka.mysql.fi
8611ac7a9c After merge fix 2003-01-29 19:33:48 +02:00
monty@mashka.mysql.fi
9e3fd09305 merge with 3.23.56 to get patches for --lower-case-table-names and
proper handling of SUM() in some functions.
2003-01-29 19:22:22 +02:00
bell@sanja.is.com.ua
c6beb583f6 fixed functions to be able work with group function as argument
made bisone 1.75 compatible code
2003-01-29 10:38:56 +02:00
serg@serg.mysql.com
9199252c22 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-01-28 14:37:12 +01:00
serg@serg.mysql.com
4fb3244014 fixed "DROP table_open_in_handler" hang 2003-01-28 14:36:22 +01: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
monty@mashka.mysql.fi
279f43a198 Updated results for 4.0 2003-01-28 09:17:10 +02:00
monty@mashka.mysql.fi
6b71279382 merge 2003-01-28 09:02:51 +02:00
monty@mashka.mysql.fi
152f0603e7 Merge with 3.23.56 (Replace manual with 'empty' document)
Fix for bug when using auto_increment column and LAST_INSERT_ID()
2003-01-28 08:51:03 +02:00
monty@mashka.mysql.fi
689578a099 Fixes for Netware
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL
2003-01-28 08:38:28 +02:00
monty@mashka.mysql.fi
710ffb2d89 Fix when using auto_increment and last_insert_id() in the same insert statement. 2003-01-28 06:48:26 +02:00
serg@serg.mysql.com
78f492b112 do not force CONNECTION_ID(), FOUND_ROWS(), PI(), CURRENT_USER(),
and VERSION() to be uppercase in e.g. "select pi()"
2003-01-28 00:55:41 +01:00
serg@serg.mysql.com
335f013161 select count(*) from t1 procedure analyse(); bug fixed 2003-01-27 15:37:05 +01:00
serg@serg.mysql.com
5f6b6fa3b3 fixes for SHOW VARIABLES and --ft-stopword-list 2003-01-27 12:12:12 +01:00
serg@serg.mysql.com
4b61ba5a89 ft_stopword_file added to 'SHOW VARIABLES' output 2003-01-27 11:15:54 +01:00
bell@sanja.is.com.ua
760e22f0bb after merge fix of 577 task (SCRUM, pre commit to be able to merge with static tables optimization fix)
fixed derived tables with subselect inside
2003-01-26 21:30:35 +02: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
bell@sanja.is.com.ua
9ec97f2c08 fixed table invalidation in simple renaming 2003-01-24 01:54:39 +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
hf@deer.mysql.r18.ru
e2d991795c SCRUM
DEFAULT in SELECT & UPDATE corrections
2003-01-22 20:08:12 +04:00
monty@mashka.mysql.fi
7436e9ec97 Merge 2003-01-21 21:28:51 +02:00
serg@serg.mysql.com
49580a5168 fulltext2.test: --enable/disable_warnings 2003-01-21 20:11:24 +01: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
serg@serg.mysql.com
3f55032c12 merged 2003-01-21 19:37:38 +01:00
serg@serg.mysql.com
0dff67cba2 Two-level index structure for FULLTEXT indexes 2003-01-21 19:24:34 +01:00
Sinisa@sinisa.nasamreza.org
74f478f9a5 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-01-21 15:54:36 +02: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
monty@mashka.mysql.fi
6522ee6c98 Merge with 4.0 (Fix bug in LEFT JOIN and EXPLAIN on empty table) 2003-01-20 18:48:10 +02:00
monty@mashka.mysql.fi
fab7f39e42 Fixed bug with EXPLAIN on empty table 2003-01-20 18:17:14 +02:00
monty@mashka.mysql.fi
a5e30be0d0 Fixed bug in LEFT JOIN with impossible ON/WHERE expression 2003-01-19 17:15:14 +02: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@mashka.mysql.fi
76f146a175 Merge with 4.0.9 2003-01-18 03:13:37 +02:00
Sinisa@sinisa.nasamreza.org
fe5e05cd90 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-01-17 14:52:50 +02:00
gluh@gluh.mysql.r18.ru
f2a193521e Merge sgluhov@work.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.upd
2003-01-17 16:40:54 +04:00
gluh@gluh.mysql.r18.ru
6ac602142a Replication: Optimize away string.append
Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat
Fixed rpl_temporary test
2003-01-17 16:39:29 +04:00
monty@mashka.mysql.fi
9fb3f5aa1a Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-01-17 14:23:48 +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
monty@mashka.mysql.fi
5c7d102043 After merge fix 2003-01-17 13:57:15 +02:00
serg@serg.mysql.com
390982aaa3 bugfix for MERGE tables and MAX(key) 2003-01-17 12:48:23 +01:00
monty@mashka.mysql.fi
f4b950df96 Merge with 3.23 2003-01-16 20:47:46 +02:00
serg@serg.mysql.com
c16e908a2b bugfix for 'ANALYZE for MERGE' and table-less MERGE table 2003-01-16 13:23:33 +01:00
jani@rhols221.adsl.netsonic.fi
e79ed81d11 Added --compatible mode to mysqldump. 2003-01-16 05:35:59 +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
monty@mashka.mysql.fi
22b7e67b0b merge 2003-01-14 14:33:10 +02:00
monty@mashka.mysql.fi
7e9b27eaf5 Updates for multi-byte character sets
(Note: test 'union' fails, but Sanja promised to fix this)
2003-01-14 14:28:36 +02:00
monty@mashka.mysql.fi
8dd439e751 Guard against compiling without -fno-exceptions
Allocate bigger default thread stack because of problems with glibc
Fixed bug in UPDATE ... not_null_field=expression_that_returns_null
Fixed bug in replication when using auto_increment and LOAD DATA INFILE
2003-01-14 11:27:26 +02:00
Sinisa@sinisa.nasamreza.org
6b386c08a5 Fix for a bug in SHOW GRANTS when :
grant on database.* to xx@yy with grant option;

is done.
2003-01-11 18:02:10 +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
Sinisa@sinisa.nasamreza.org
3772d5ff60 Fixex for some crashing bug 2003-01-10 17:36:59 +02:00
venu@myvenu.com
389aa45c9c Merge venu@work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-01-09 16:54:38 -08:00
Sinisa@sinisa.nasamreza.org
6b9f24be88 changing a bit SHOW GRANTS to display empty row in global table. 2003-01-09 23:21:20 +02: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
venu@myvenu.com
a9b2d52573 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
2003-01-09 09:55:45 -08:00
bar@bar.mysql.r18.ru
8b2b69c8eb euc_kr, koi8_r and koi8_u have been renamed so that now
all charset names don't have "_" sign.
2003-01-09 17:39:02 +04:00
bar@bar.mysql.r18.ru
a89df5a096 Separating CHARSET and COLLATION terms 2003-01-09 15:37:59 +04:00
ram@mysql.r18.ru
4df915a7b5 fixed order_by test to make it repeatable 2003-01-09 14:35:01 +04:00
monty@mashka.mysql.fi
54ad6de1d9 Portability fix 2003-01-09 11:11:06 +02: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
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
ram@mysql.r18.ru
30e15bbb6c Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
2003-01-08 11:53:09 +04:00
venu@myvenu.com
79dd162ed1 Simple misc cases - warnings 2003-01-07 18:59:08 -08:00
monty@mashka.mysql.fi
ee59eb2418 Portability fixes
Fixed test suite for HPUX 10.20 and MacOSX
2003-01-07 16:53:10 +02:00
monty@mashka.mysql.fi
edb019aeaf Updated test results 2003-01-06 11:44:18 +02:00
ram@mysql.r18.ru
aa946a84ff Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
2003-01-06 13:13:57 +04:00
monty@mashka.mysql.fi
6be1b941bc merge 2003-01-06 02:46:36 +02:00
monty@mashka.mysql.fi
fb1665200f merge post fix 2003-01-06 02:41:53 +02:00
monty@mashka.mysql.fi
803dff1002 Merge with 4.0.8 2003-01-06 02:04:52 +02:00
monty@mashka.mysql.fi
1f6ecc0cd3 Changed mysql-test to print warnings for not existing table to DROP TABLE
Cleaned up test; Removed wrong DROP TABLE commands and use standard table and database names.
changed store_warning() -> push_warning_print()
2003-01-06 01:48:59 +02:00
bar@bar.mysql.r18.ru
4e405fa200 koi8_ru -> koi8_r
charset.conf -> charset.xml
bug fix
2003-01-05 17:34:24 +04:00
bell@sanja.is.com.ua
cfc99ce45c fixed SET with subselect 2003-01-04 16:33:42 +02:00
monty@mashka.mysql.fi
f9772317ee merge 2003-01-04 15:40:55 +02:00
monty@mashka.mysql.fi
6d6f051178 Added support for DROP TEMPORARY TABLE
Removed mysql_warnings() API function.
Post merge fixes.
2003-01-04 15:37:20 +02:00
monty@mashka.mysql.fi
7d410b7339 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-01-04 15:18:18 +02:00
monty@mashka.mysql.fi
6d5ad61a11 Added support for max_allowed_packet in option files read by mysql_option()
Extended max_allowed_packet for clients to 1G
Fixed bug in sending compressed rows >= 16M
Fix bug in skiping too long packets from clients.
Added checking of wrong command number sent by client.
2003-01-04 15:17:16 +02:00
ram@mysql.r18.ru
a7ef436bc4 Optimization of key usage (ORDER BY) (SCRUM) 2003-01-04 14:59:52 +04:00
bell@sanja.is.com.ua
02810a48be Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-do-4.1
2003-01-03 19:35:14 +02:00
ram@mysql.r18.ru
74a9fb244a Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.0
into mysql.r18.ru:/usr/home/ram/work/mysql-4.0
2003-01-03 19:47:58 +04:00
ram@mysql.r18.ru
8009c16a34 Fix for the QUOTE() function. 2003-01-03 19:46:15 +04:00
bell@sanja.is.com.ua
9c63b18f97 fixed do with subselects 2003-01-03 17:08:00 +02:00
peter@mysql.com
d9785d0193 Merge pzaitsev@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pz/mysql/mysql-4.1-root
2003-01-03 17:30:03 +03:00
Sinisa@sinisa.nasamreza.org
164ab11b29 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-01-03 15:08:40 +02:00
monty@mashka.mysql.fi
07daf3169e Merge with 4.0.8 2003-01-03 00:04:33 +02: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
ram@mysql.r18.ru
aedd600401 Fix for QUOTE() function. 2003-01-01 15:59:35 +04:00
bell@sanja.is.com.ua
c7a02249f5 postreviews fix (SCRUM related)
reordered Item_row class variables to be sorted by memory size
2002-12-31 18:39:16 +02:00
Sinisa@sinisa.nasamreza.org
885d9d9037 A fix for a charset bug in the select_export (select into
outfile) class.
2002-12-31 18:01:53 +02:00
bell@sanja.is.com.ua
7c0a074614 merging 2002-12-31 12:55:03 +02: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
venu@myvenu.com
c26dfb9bd6 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
2002-12-30 15:16:12 -08:00
venu@myvenu.com
d5631610db pure coverage test updates 2002-12-30 15:10:10 -08:00
peter@mysql.com
b780ee20cd Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-12-30 20:42:03 +03:00
Sinisa@sinisa.nasamreza.org
a4a80302b8 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-30 19:42:03 +02:00
vva@eagle.mysql.r18.ru
8797bb2551 fixing rpl_temporary.test for FreeBSD/Linux thread-order (it add 4 sec. sleep) 2002-12-30 21:42:02 +04:00
peter@mysql.com
a464f09ee7 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-12-30 11:10:23 +03:00
vva@eagle.mysql.r18.ru
6ab60981e8 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_TEMPORARY/4.1
2002-12-30 01:59:08 +04:00
vva@eagle.mysql.r18.ru
1dcca480e8 processing thread specific queries 2002-12-30 01:46:48 +04: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
monty@mashka.mysql.fi
f22fde21c0 Fixed max_key_length when using UNIQUE keys.
This fixed a bug in GROUP BY on a BLOB column with NULL values.
2002-12-27 21:39:35 +02:00
bell@sanja.is.com.ua
e3ba256491 Merge sanja.is.com.ua:/home/bell/mysql/work-row-4.1
into sanja.is.com.ua:/home/bell/mysql/work-from-4.1
2002-12-27 21:36:56 +02: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
monty@mashka.mysql.fi
0a5338614a Test cleanup 2002-12-26 15:55:22 +02:00
monty@mashka.mysql.fi
6153b24077 merge 2002-12-26 15:26:32 +02:00
monty@mashka.mysql.fi
8f046a0195 Update of test results 2002-12-26 15:24:40 +02:00
bell@sanja.is.com.ua
1dd7cb52ae support of subselect without FROM reducing (SCRUM)
fixed bug of calling setup_fields without correct lex->current_select pointer in mysql_derived
more correct creation of reference in Item_field::fix_field
2002-12-26 01:28:59 +02:00
Sinisa@sinisa.nasamreza.org
672a695f8f bug fixes and tests ... 2002-12-25 15:07:36 +02:00
ram@mysql.r18.ru
abf49f3228 BDB logs deleting has been moved from start_master
to the start of mysql-test-run
2002-12-25 16:34:32 +04:00
bell@sanja.is.com.ua
521ec3163e results fixing 2002-12-25 14:33:28 +02:00
bell@sanja.is.com.ua
e67a0d2b86 check of LIMIT in row IN subquery (SCRUM related) 2002-12-25 12:03:08 +02:00
bell@sanja.is.com.ua
980ca35645 merging 2002-12-25 11:09:19 +02:00
Sinisa@sinisa.nasamreza.org
5c0bd57b8f fix for an error in the merge from 3.23 2002-12-24 14:33:11 +02:00
bell@sanja.is.com.ua
61ae697837 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-derived-4.1
2002-12-24 14:08:44 +02:00
Sinisa@sinisa.nasamreza.org
7f304a2746 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-24 14:02:42 +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
50481ebfb6 LIMIT is prohibited in IN/ALL/ANY/SOME 2002-12-23 18:25:25 +02:00
monty@mashka.mysql.fi
f03bbd3fe2 Merge with 3.23:
Remove duplicate casedn_str() in mysql_change_db()
Fix for null handling in CASE
2002-12-21 10:56:40 +02:00
monty@mashka.mysql.fi
8b56ca0ef3 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-12-20 14:59:35 +02:00
monty@mashka.mysql.fi
b5aa9ae0c7 Changed thd variables max_join_size and select_limit to type ha_rows.
This fixed some optimization problems when using -DBIG_TABLES
Portabilty fixes for OpenUnix and HPUX
Added C and C++ version numbers to mysqlbug
2002-12-20 14:58:27 +02:00
bar@bar.mysql.r18.ru
347dcbfc98 COUNT(DISTINCT) charset related test 2002-12-20 13:00:06 +04:00
bell@sanja.is.com.ua
b63f230346 row IN subselects (SCRUM) 2002-12-19 21:15:09 +02:00
bar@bar.mysql.r18.ru
4dd7dc0f27 ctype_many.result:
COUNT(DISTINCT expr) and charset related test
2002-12-19 16:50:48 +04:00
bell@sanja.is.com.ua
4cfb6d97b5 support of simple row subselects (SCRUM) 2002-12-19 07:38:33 +02:00
Sinisa@sinisa.nasamreza.org
a151472a93 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-19 07:38:27 +02: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
5961bff59b Fix for found rows in multi-table updates 2002-12-18 19:00:00 +02:00
bell@sanja.is.com.ua
9e2d9aa274 fixed derived table visibility scope for derived tables with union 2002-12-17 23:18:19 +02:00
Sinisa@sinisa.nasamreza.org
675098852c Fix for fix_fields in derived tables with UNION's .... 2002-12-17 22:36:23 +02:00
Sinisa@sinisa.nasamreza.org
a83ed34f83 A fix for a bug in fix_fields in case like this:
select .. UNION select some_column;

This is exhibited in sub-selects and derived tables.
2002-12-17 20:15:15 +02:00
Sinisa@sinisa.nasamreza.org
8ebc983442 fix for a bug in CASE ...WHEN ... 2002-12-16 22:16:57 +02:00
bell@sanja.is.com.ua
79a184fe09 moved links initialization 2002-12-15 22:01:09 +02:00
bell@sanja.is.com.ua
e82b91e1c8 fixed subselect null test
fixed method definition (overloading instead of redefinition)
fixed time expression type definition
2002-12-15 11:14:53 +02:00
bell@sanja.is.com.ua
fccf8e74f1 fixed test result 2002-12-15 10:23:55 +02:00
monty@mashka.mysql.fi
d783e18436 merge 2002-12-14 17:49:01 +02:00
monty@mashka.mysql.fi
d49167bae5 Fixes for binary protocol (complement to last push)
Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format.
DATE_ADD() and related functions now returns correct DATE/DATETIME type depending on argument types.
Now all tests passes, still some work left to remove warnings in log files from mysql-test-run
2002-12-14 17:43:01 +02: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
monty@mashka.mysql.fi
9c509fcb52 Transactions in AUTOCOMMIT=0 mode didn't rotate binary log
Don't enable any bulk insert or record caching code if inserting less than MIN_ROWS_TO_USE_BULK_INSERT rows (100)
2002-12-14 12:45:31 +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
4963f1c6c9 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
into eagle.mysql.r18.ru:/home/vva/work/SOUNDS_LIKE/4.1
2002-12-14 02:18:58 +04:00
vva@eagle.mysql.r18.ru
7050b5eb4d add 'SOUNDS LIKE' syntax 2002-12-14 02:18:14 +04:00
monty@mashka.mysql.fi
e6c4399f64 RESET SLAVE and CHANGE MASTER will now give an error if slave is running.
This fixes a problem in replication where RESET SLAVE could crash a running slave.
2002-12-13 12:05:24 +02:00
Sinisa@sinisa.nasamreza.org
a918a6a7a9 derived tables with UNION's ...
Scrum task !!!!!
2002-12-12 16:09:06 +02:00
bell@sanja.is.com.ua
3103bca9b2 merging 2002-12-11 19:53:57 +02: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
monty@mashka.mysql.fi
a241d9a0f7 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2002-12-11 09:18:43 +02:00
monty@mashka.mysql.fi
d3eb993a27 rename of net_pkg.cc to protocol.cc
Class for sending data from server to client (Protocol)
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.
2002-12-11 09:17:51 +02:00
serg@serg.mysql.com
215df4fc23 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-12-10 21:38:30 +01:00
serg@serg.mysql.com
7f7dc20e54 order_by.result, key_diff.result:
updated
2002-12-10 21:38:00 +01:00
bell@sanja.is.com.ua
5fc21bc187 postreview fix (SCRUM)
NULL fixed
max_length fixed
layout fixed
2002-12-10 18:10:00 +02:00
Sinisa@sinisa.nasamreza.org
2391b5cb3e Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-10 13:39:06 +02:00
bell@sanja.is.com.ua
2885d55261 merging 2002-12-10 11:45:40 +02:00
bell@sanja.is.com.ua
6db77efb75 merging 2002-12-10 11:41:47 +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
peter@mysql.com
710881e4fb Proper cleanup for BDB test 2002-12-09 19:20:05 +03:00
bell@sanja.is.com.ua
814510d547 optimized IN with Rows (SCRUM)
NULL with row (IN)
cardinality error of row inside row
new[]
fixed layout
2002-12-08 03:19:03 +02:00
serg@serg.mysql.com
b42eff16cb bulk insert code optimized 2002-12-07 22:40:20 +01:00
bell@sanja.is.com.ua
67eebb4382 IN with row item without constant optimisation (SCRUM)
renamed row item test
2002-12-07 19:58:05 +02:00
Sinisa@sinisa.nasamreza.org
270895bee3 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-07 12:19:33 +02:00
monty@mashka.mysql.fi
9613e5c2ae Don't initialize fulltext functions twice in multi-table-update 2002-12-06 22:49:16 +02:00
bell@sanja.is.com.ua
4506ab9ef1 _NEW_ IN/ALL/ANY/SOME behaviour with NULL (SCRUM related)
optimization of left expression evaluation
more descriptive method name
2002-12-06 21:55:53 +02: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
Sinisa@sinisa.nasamreza.org
f83b0a3cfe Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-06 18:36:25 +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
Sinisa@sinisa.nasamreza.org
a072ff3f9c small error in result 2002-12-05 22:57:22 +02:00
Sinisa@sinisa.nasamreza.org
df07c4d8ea Fix for few PROCEDURE bugs ... 2002-12-05 21:51:22 +02:00
monty@mashka.mysql.fi
859b688476 Merge with 4.0.6 2002-12-05 19:38:42 +02:00
monty@mashka.mysql.fi
7d681c4449 Copy arguments given to mysql_server_init()
Made keybuff_size longlong (To make show variables work similar on 32
and 64 bit systems)
Fixed some 'not initalized variable errors' in multi-table-update.
Fixed memory leak in multi-table-update.
Now all tests works under valgrind without any errors.
2002-12-05 16:38:49 +02:00
peter@mysql.com
dac10a8c81 Fix minor bug and add test of connection with new/old/without passwords 2002-12-05 14:01:15 +03:00
monty@mashka.mysql.fi
2435dce96d Merge with 3.23 2002-12-05 03:52:53 +02:00
monty@mashka.mysql.fi
fc06433a69 Removed copying of parameters as this leads to memory leaks in embedded server.
Fixed 'not initialized' memory error.
2002-12-05 03:40:33 +02:00
Sinisa@sinisa.nasamreza.org
82a9669267 a test case for double free'ing of pointer in alter table ... 2002-12-04 21:50:59 +02:00
Sinisa@sinisa.nasamreza.org
93c7ceaaec Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-12-04 15:28:16 +02:00
Sinisa@sinisa.nasamreza.org
dd2012067e A fix for the bug in a SELECT with joined tables with ORDER BY and
LIMIT clause when filesort had to be used.

In that case LIMIT was applied to filesort of one of the tables, 
although it could not be.

This fix solved problems with LEFT JOIN too...
2002-12-04 15:27:08 +02: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
serg@serg.mysql.com
edb671e270 post-merge fix 2002-12-04 10:47:51 +01:00
serg@serg.mysql.com
6dfd1d867e merged 2002-12-04 10:16:19 +01:00
bell@sanja.is.com.ua
91bd1e4cc5 fixed error message 2002-12-04 01:32:45 +02:00
monty@hundin.mysql.fi
8830eb4aa9 Change of internal key_field=NULL handling to avoid error messages.
Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
Fixed reference to uninitalized variable
2002-12-03 13:08:25 +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
451440f930 one more test 2002-12-02 21:12:25 +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
Sinisa@sinisa.nasamreza.org
5483796c50 Proper handling of ORDER BY table.column in UNION's 2002-12-02 20:18:51 +02:00
Sinisa@sinisa.nasamreza.org
a655fdb10d Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-02 18:47:52 +02:00