hf@genie.(none)
5e8b27c0d3
Pull conflicts resolutions
2002-11-29 12:35:48 +04:00
bell@sanja.is.com.ua
fcb0b8815b
merging
2002-11-28 20:12:14 +02:00
bell@sanja.is.com.ua
b8b7d0b03b
fixed * without tables in IN bug
...
fixed sunction-test select in IN bug
fixed unions in subselect bug
2002-11-28 19:29:26 +02:00
bell@sanja.is.com.ua
4be2cfd62d
merging
2002-11-27 19:31:11 +02:00
bell@sanja.is.com.ua
f8ff8fc6de
after review changes in IN/ALL/ANY/SOME (SCRUM)
2002-11-27 17:04:43 +02:00
bell@sanja.is.com.ua
d40bec6829
Merge
2002-11-25 17:53:03 +02:00
bell@sanja.is.com.ua
c74c93ffc3
supported possiblity of item substitute (fixed bug) in setup_fields
...
more efficient reference creation
fixed table_name of Field in temporary table
2002-11-25 01:38:56 +02:00
bell@sanja.is.com.ua
1cee49dd86
Reference to field in outer subelect fixed
...
Fixed context in error mesages
2002-11-24 21:10:52 +02:00
bell@sanja.is.com.ua
aa5983b4a7
fixed removed by previos patch thd->allow_sum_func "side effect" of setup_conds
...
renamed tables to prevent droping real tables
2002-11-24 17:41:34 +02:00
bell@sanja.is.com.ua
c8d8367021
revert open_ltable changing
2002-11-23 23:21:49 +02:00
bell@sanja.is.com.ua
f6f937085f
fixed bug with thd->allow_sum_func value in subselect
2002-11-23 21:55:39 +02:00
bell@sanja.is.com.ua
2024464018
merging
2002-11-23 19:20:04 +02:00
monty@mashka.mysql.fi
dac6498f9b
Merge with 4.0
2002-11-21 15:56:48 +02:00
Sinisa@sinisa.nasamreza.org
d7344d9fa4
small revert
2002-11-18 23:11:45 +02:00
Sinisa@sinisa.nasamreza.org
4cec1660da
fix for message being sent in EXPLAIN ...
2002-11-18 20:58:04 +02:00
monty@mashka.mysql.fi
1a96948e81
Small improvement to alloc_root
...
Add support for LIMIT # OFFSET #
Changed lock handling: Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE
2002-11-16 20:19:10 +02:00
bell@sanja.is.com.ua
7a9f47759e
basic row Items (SCRUM)
2002-11-15 20:32:09 +02:00
serg@serg.mysql.com
9b0aca768d
removed redundant line
2002-11-13 15:57:29 +01:00
Sinisa@sinisa.nasamreza.org
c92bbccbc1
Merge
2002-11-12 16:27:52 +02:00
Sinisa@sinisa.nasamreza.org
9ef50038f8
IGNORE_INDEX fix for 4.0
2002-11-12 16:22:26 +02:00
monty@mashka.mysql.fi
97bb57f765
Extended WEEK() to be able to handle ISO weeks.
...
unlink socket file if mysqld dies on startup
Some optimization of AND expressions
2002-11-12 12:42:42 +02:00
Sinisa@sinisa.nasamreza.org
c6b0d33619
some bug fixes related to derived tables
2002-11-11 17:45:23 +02:00
monty@mashka.mysql.fi
876f3f4d30
Fixed that NULL and 0 returns 0 instead of NULL
...
This is coded to not cause a speed impact on top level AND expressions where we don't care if an AND expression returns 0 or NULL
2002-11-11 15:57:35 +02:00
serg@serg.mysql.com
65f276f10c
merged
2002-11-09 19:27:28 +01:00
serg@serg.mysql.com
6b8bf756b1
IGNORE/USE INDEX now work with HA_EXTRA_KEYREAD
2002-11-09 19:15:46 +01:00
monty@hundin.mysql.fi
aa4e165808
Portability fix extern "C" static -> extern "C"
2002-11-07 12:49:02 +02:00
monty@butch.
890b39bb68
merge
2002-11-07 12:49:01 +02:00
hf@genie.(none)
25bd1e9a37
Merged by hands
2002-11-07 12:20:08 +04:00
monty@hundin.mysql.fi
65badfff1a
Put temporary files in binlog cache when using BEGIN/COMMIT
...
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
New variables @@rand_seed1 and @@rand_seed2 (used by replication)
DROP TEMPORARY TABLE
2002-11-07 04:02:37 +02:00
monty@butch.
a2bdf9265f
Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.
2002-11-07 03:54:00 +02:00
monty@hundin.mysql.fi
5333cfb429
Removed wrong patch to fix DATE BETWEEN TIMESTAMP1 AND TIMESTAMP2
...
Some simple optimizations
2002-11-05 22:45:42 +02:00
bell@sanja.is.com.ua
bb49de5ff5
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-pointer-4.1
2002-11-04 15:45:54 +02:00
bell@sanja.is.com.ua
c94b39134f
Fixed error handling bug
2002-11-04 00:56:25 +02:00
bell@sanja.is.com.ua
1f20cf3b42
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion (SCRUM)
...
fixed some possible bugs
2002-10-30 13:18:52 +02:00
monty@hundin.mysql.fi
1e0538324d
Added back old LARGEFILE handling
...
Fixed reference to freed memory in acl_init()/grant_init()
Fixed possible memory leak. (Could only happen in very strange circumstances)
Fixed bug in ALTER TABLE with BDB tables
Updated mysql-test for valgrind
2002-10-29 21:59:03 +02:00
serg@serg.mysql.com
1a1cafce63
merged
2002-10-25 22:07:04 +00:00
serg@serg.mysql.com
dede6634f6
merged
2002-10-25 21:15:52 +00:00
bell@sanja.is.com.ua
21ca25debf
fixed update with subselect (FOR REVIEW)
2002-10-24 22:59:29 +03:00
monty@hundin.mysql.fi
36afa9a96e
Fixed problem with BDB tables and ALTER TABLE
2002-10-24 01:29:29 +03:00
hf@genie.(none)
8a88791fb1
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
...
into genie.(none):/home/hf/work/mysql-4.1
2002-10-18 15:55:21 +05:00
serg@serg.mysql.com
4842b82e9f
Merge work:/home/bk/mysql-4.1
...
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-10-08 14:17:38 +00:00
serg@serg.mysql.com
3217f2cc06
support for --tmpdir=dir1:dir2:...
2002-10-08 12:39:37 +00:00
bell@sanja.is.com.ua
2715d331f7
fixed couple of bugs in field/reference name resolution
...
fixed error handling in subselect fix_field
2002-10-08 14:50:12 +03:00
hf@genie.(none)
55866b0615
Huge pull
2002-10-07 15:38:07 +05:00
bell@sanja.is.com.ua
199f667c19
merging
2002-10-04 14:15:59 +03:00
monty@mashka.mysql.fi
2e52a69b12
Merge work:/my/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
2002-10-03 16:56:09 +03:00
bell@sanja.is.com.ua
48b2a76a48
after merging bugfix
2002-10-03 16:35:08 +03:00
monty@mashka.mysql.fi
0f39457613
Merge with 4.0.4
2002-10-02 17:55:12 +03:00
monty@mashka.mysql.fi
a748b35ddd
merge with work
2002-10-02 13:45:16 +03:00
monty@mashka.mysql.fi
d69250a969
Fixes and code cleanups after merge with 4.0.3
...
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
2002-10-02 13:33:08 +03:00
