mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
15089 commits 2784 branches 343 tags 1.6 GiB
Commit graph

3543 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
ebd03ae4a8 do not use Item_ref for view fields if it is UPDATE of INSERT (BUG#5263) 2004-09-06 14:37:10 +03:00
monty@mysql.com
5d71817c70 After merge fixes 2004-09-05 02:31:11 +03:00
monty@mysql.com
9d8555c0f0 Merge with 4.0 to get latest bug fixes 2004-09-04 15:59:49 +03:00
bell@sanja.is.com.ua
161662ba4c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2004-09-04 15:32:13 +03:00
serg@serg.mylan
9153fd2ae4 merged 2004-09-03 22:12:27 +02:00
serg@serg.mylan
9b0468bc96 BUG#5327 - mi_sort_index() of 2-level tree 2004-09-03 22:04:08 +02:00
konstantin@mysql.com
bdec2c603b A fix for bug#4368 '"like" fails in PreparedStatement, crashes 
server': the bug occurs when arguments of LIKE function are in 
differentcharacter sets. If these character sets are compatible, 
we create an item-converter. In prepared mode, this item
needs to be created in memory of current prepared statement.
 2004-09-03 23:28:49 +04:00
ram@gw.mysql.r18.ru
f91ca0bd66 A fix (Bug #4980: union statement with () union () order by produces wrong explain). 2004-09-03 19:59:29 +05:00
bell@sanja.is.com.ua
bd2c119176 CHECK OPTIONs added (WL#1983) 2004-09-03 15:18:40 +03:00
monty@mysql.com
bb4ccdb177 Remove extra '/' after mysql_real_data_home 
Add missing parameter to strxnmov() that caused some INTO OUTFILE commands to core dump
 2004-09-03 02:25:27 +03:00
pem@mysql.comhem.se
e04f4fb46c Fixed BUG#5307: Stored procedure allows statement after BEGIN ... END. 2004-09-02 19:14:34 +02:00
pem@mysql.comhem.se
fee115adca Fixed BUG#5287: Stored procedure crash if leave outside loop. 
Bug in diff_handlers and diff_cursors made it attempt to pop
the wrong number at jumps sometimes.
 2004-09-02 17:24:25 +02:00
monty@mysql.com
8547d98c88 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-09-02 16:58:01 +03:00
monty@mysql.com
dec44916c1 After merge fixes 2004-09-02 16:57:26 +03:00
ram@gw.mysql.r18.ru
c6b2b2f09d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5232
 2004-09-02 16:25:32 +05:00
bell@sanja.is.com.ua
f1bbfdf4a6 checked INTO clause during view creation (BUG#5332) 2004-09-02 12:09:26 +03:00
bar@mysql.com
f37df2fdcc Bug#4338 mysql-test-run fails if compiled with non-latin1 character set 2004-09-02 12:34:27 +05:00
bell@sanja.is.com.ua
31dacc6ede Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2004-09-02 07:52:29 +03:00
bell@sanja.is.com.ua
1410ac22c4 fixed bug handling in views (BUG#5276) 2004-09-02 07:40:48 +03:00
bell@sanja.is.com.ua
36667b6a91 fixed printing of characters casting operartion (BUG#5264) 2004-09-02 00:11:40 +03:00
bell@sanja.is.com.ua
d1b667bdd1 fixed staistic of subquery if outer field resolved in merged view (BUG#5247) 2004-09-01 23:27:40 +03:00
bell@sanja.is.com.ua
d38bd725ef system charset (with wich VIEW printed) saved in .frm and restored before parsing view (BUG#5163) 2004-09-01 22:48:59 +03:00
bell@sanja.is.com.ua
b57e68e6e0 fixed typo in group_concat printing (BUG#5161) 2004-09-01 21:32:24 +03:00
bell@sanja.is.com.ua
80a28d458a fixed printing of real constants (BUG#5160) 2004-09-01 20:30:48 +03:00
bell@sanja.is.com.ua
56d8567a3d adding mysql.proc to table list if view contains stored procedures (BUG#5151) 2004-09-01 19:00:41 +03:00
bar@mysql.com
153e18a252 Allow IN to convert arguments into Unicode in some cases. 2004-09-01 15:39:15 +05:00
monty@mysql.com
054cea4ca8 Merge with 4.0 2004-09-01 04:12:09 +03:00
monty@mysql.com
ba4d4ce97a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-09-01 02:13:35 +03:00
bell@sanja.is.com.ua
b02451c5bd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-not-4.1
 2004-08-31 21:11:54 +03:00
bell@sanja.is.com.ua
2cf1234ba2 after review patch 2004-08-31 21:10:57 +03:00
mskold@mysql.com
ae801bad8d Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-08-31 15:53:28 +02:00
monty@mysql.com
7abae83300 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-08-31 16:53:25 +03:00
monty@mysql.com
6adaff23a4 Review of new pushed code (Indentation fixes and simple optimizations) 
Use 'mysqltest' as test database instead of test_$1 or test1,test2 to not accidently delete an important database
Safety fix for mailformed MERGE files
 2004-08-31 14:35:04 +03:00
sergefp@mysql.com
e4ffae2a0e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-bug-psnames
 2004-08-31 14:12:42 +04:00
mskold@mysql.com
84196617c1 Fix for bug#5312 Ndb Cluster returns wrong error code for duplicate key at insert 2004-08-31 12:07:48 +02:00
bell@sanja.is.com.ua
771c2998ed ORDER clause printing fixed (BUG#5156) 2004-08-31 11:58:45 +03:00
mskold@mysql.com
b0bac7d1e0 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-08-31 10:20:51 +02:00
mskold@mysql.com
4f8a82dbfe Enabled HA_NULL_IN_KEY support 2004-08-31 10:19:10 +02:00
mskold@mysql.com
4b1671c933 Simplified expensive test 2004-08-31 10:00:33 +02:00
bell@sanja.is.com.ua
392c306969 fixed open_and_lock_tables result processing (all open_and_lock_tables revision) 
fixed printing of COLLATE operation
(BUG#5155)
 2004-08-31 10:06:38 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
7ee2f2c6bb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/mysql-5.0
 2004-08-30 22:11:14 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
203debc666 Fix column name where it starts with a backtick 2004-08-30 22:08:51 +01:00
bell@sanja.is.com.ua
7682b10ee8 fixed case when real length very close to calculated (BUG#5150) 2004-08-30 22:52:50 +03:00
bell@sanja.is.com.ua
a43c40f10f fixed printing of stored procedure functions names (BUG#5149) 2004-08-30 21:47:52 +03:00
serg@serg.mylan
49d49e2fcb Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-30 16:32:10 +02:00
serg@serg.mylan
994d648dda space-stripping in _mi_prefix_search: BUG#5284 2004-08-30 16:12:53 +02:00
pem@mysql.comhem.se
12b1c4b330 Fixed BUG#5279: Stored procedure packets out of order if CHECKSUM TABLE. 2004-08-30 14:52:21 +02:00
sergefp@mysql.com
3dfbc35f45 Fix for BUG#5242: Made SQL Syntax Prepared Statement names case-insensitive. 2004-08-29 19:44:28 +04:00
monty@mysql.com
f574cd4e8f Code style fixes. 
Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
 2004-08-28 00:49:54 +03:00
joreland@mysql.com
cca01b0191 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-27 19:02:46 +02:00
bar@mysql.com
b604164599 Bug#2451 ALTER doesn't result in an error on CHARACTER SET and COLLATION conflict 2004-08-27 20:48:19 +05:00
bar@mysql.com
e8fcc297e1 grant.result: 
Forgot to push in the previous changeset
 2004-08-27 20:48:18 +05:00
pem@mysql.comhem.se
f723438555 Fixed BUG#5251: mysql changes creation time of a procedure/function when altering. 2004-08-27 16:41:34 +02:00
timour@mysql.com
e2cd3dd1ce WL#1724 "Min/Max Optimization for Queries with Group By Clause" 
- after-review changes
- merged with the source tree from 204-08-27
 2004-08-27 16:37:13 +03:00
joreland@mysql.com
f33207ac8d Fix order by 2004-08-27 14:15:47 +02:00
joreland@mysql.com
e85ce08901 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-27 14:02:02 +02:00
ram@gw.mysql.r18.ru
3acccb988a A fix (Bug #5232: CREATE TABLE ... SELECT can deadlock itself). 2004-08-27 16:43:01 +05:00
bar@mysql.com
10b88b37b7 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2004-08-27 15:56:27 +05:00
bar@mysql.com
b10dcf7aa6 grant.result: 
Bug 4338 mysql-test-run fails if compiled with non-latin1 character set: partual fix.
 2004-08-27 15:55:16 +05:00
bell@sanja.is.com.ua
508fb5aa12 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2004-08-27 07:59:30 +03:00
joreland@mysql.com
6df66180bd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-27 01:01:47 +02:00
joreland@mysql.com
95e5b457b8 Fix ordered index scan with partially specified key 2004-08-27 00:59:16 +02:00
bell@sanja.is.com.ua
7e446b8349 Item name for VIEW added to find_field_in_table (BUG#5147) 2004-08-27 00:08:59 +03:00
serg@serg.mylan
acbf96a161 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-26 17:49:16 +02:00
monty@mysql.com
ceba1429b7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-08-26 18:27:33 +03:00
monty@mysql.com
ea687ba5da Portability fixes 
Fixed bug in end space handle for WHERE text_column="constant"
 2004-08-26 18:26:38 +03:00
serg@serg.mylan
b4bb38e896 merged 2004-08-26 15:19:46 +02:00
ram@gw.mysql.r18.ru
2a29cb0204 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5219
 2004-08-26 16:54:33 +05:00
ram@gw.mysql.r18.ru
2133721ac6 A fix (Bug#5219: Cannot use '||' with MBRContains(..)). 2004-08-26 16:51:26 +05:00
bell@sanja.is.com.ua
b836d2ddb7 fixed updateability VIEW detection (Bug#5146) 
fixed other Item_ref methods where result_field involved
 2004-08-26 14:34:56 +03:00
bar@mysql.com
87537752e2 "SELECT BINARY x" now means "SELECT CAST(x AS BINARY)". 2004-08-26 16:31:37 +05:00
pem@mysql.com
726b49d1ab Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0-merge
 2004-08-26 13:00:33 +02:00
pem@mysql.comhem.se
c81b848d20 Major rehacking and cleanup of sp_pcontext. 
This finishes (almost) WL#2002: Implement stored procedure GOTO.
Only the syntax issue for free labels remains ("label L;" vs "L:").
 2004-08-26 12:54:30 +02:00
bell@sanja.is.com.ua
8b01230e5b fix of Item_ref with result_field (BUG#5104) 2004-08-26 13:11:06 +03:00
rburnett@build.mysql.com
1e0e96a0d2 Test case for Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT list 
lowercase_table.result:
  New results for modified lowercase_table test
lowercase_table.test:
  Added test case for all uppercase database when running under lower_case_table_names.  This really only failed under Windows.  Bug# 4792
 2004-08-25 17:25:38 +02:00
bell@sanja.is.com.ua
a5f063e0da full text function moving to current select (BUG#4822) 2004-08-25 16:14:42 +03:00
bell@sanja.is.com.ua
99f92a5cab removing archive of .frm-s added (BUG#4821) 2004-08-25 14:57:57 +03:00
bell@sanja.is.com.ua
3d6318eb90 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2004-08-25 09:04:06 +03:00
bell@sanja.is.com.ua
8aed1183d8 wording changed (postreview fix) 2004-08-25 08:56:46 +03:00
mskold@mysql.com
a2bcb2a558 Cleaned up rnd_init 2004-08-24 23:13:32 +02:00
serg@serg.mylan
19f7592206 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-24 22:37:03 +02:00
bell@sanja.is.com.ua
5e0fa37830 fixes name outout for SHOW CREATE VIEW command (BUG#5162) 2004-08-24 23:07:34 +03:00
bell@sanja.is.com.ua
94bfede7e1 new method to detect commands where all VIEWs should be temporary tables (BUG#4803) 2004-08-24 22:51:23 +03:00
konstantin@mysql.com
522a27069f Merge: manual resolve 2004-08-24 23:07:08 +04:00
bell@sanja.is.com.ua
7e778e1167 fixed aggregate function processing in VIEWs (BUG#4665) 2004-08-24 20:29:44 +03:00
bell@sanja.is.com.ua
be31afd176 Fixed UNION support in view creation (BUG#4664) 2004-08-24 19:50:16 +03:00
serg@serg.mylan
8f254c1b7b followup 2004-08-24 18:20:27 +02:00
konstantin@mysql.com
ae18dc3ec8 Fix for Bug#5034 "prepared "select 1 into @arg15", second 
execute crashes server": we were deleting lex->result
after each execute, but prepared statements assumed that
it's left intact.
The fix adds cleanup() method to select_result hierarchy,
so that result objects can be reused.
Plus we now need to delete result objects more wisely.
 2004-08-24 20:17:11 +04:00
bell@sanja.is.com.ua
5abb148d01 items for functions which is converted to constants internally to support its correct printing added (BUG#4663) 2004-08-24 18:46:27 +03:00
serg@serg.mylan
8f2d92c56a manually merged 2004-08-24 17:24:23 +02:00
serg@serg.mylan
a302f88eb9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-24 17:24:05 +02:00
vva@eagle.mysql.r18.ru
b076665030 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_4998/mysql-4.1
 2004-08-24 20:18:39 +05:00
pem@mysql.comhem.se
6b5a6cdf99 Fixed BUG#3157: Crash if stored procedure contains IF EXISTS, 
and BUG#336: Subselects with tables does not work as values for
local SP variables (which was closed before with a temp. fix, but not
actually fixed).
 2004-08-24 16:07:39 +02:00
serg@serg.mylan
50ee43be43 BDB: Bug#4531: unique key prefix interacts poorly with utf8, 
Bug#4594 column index make = failed for gbk
 2004-08-24 15:32:57 +02:00
gluh@gluh.mysql.r18.ru
1786a388e4 Fix for bug #4340: find_in_set is case insensitive even on binary operators(2nd version) 2004-08-24 17:29:08 +04:00
bell@sanja.is.com.ua
393e41fe21 sending right error message where VIEW is not expected (BUG#4606) 2004-08-24 15:37:51 +03:00
hf@deer.(none)
cce03195dc Merging fix 2004-08-24 15:03:44 +05:00
hf@deer.(none)
43a853dd4d Merging 2004-08-24 12:58:21 +05:00
bell@sanja.is.com.ua
9d71f85121 subselect test split on two tests because gis extention can be absent 2004-08-24 10:15:39 +03:00
bell@sanja.is.com.ua
ea1df67d33 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2004-08-24 09:33:05 +03:00
bell@sanja.is.com.ua
3b65ce7489 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bugs-4.1
 2004-08-23 22:32:38 +03:00
bell@sanja.is.com.ua
6fcd27e9cd after review fixes: 
allowed parsing of table fields inside aggregate functions
 added new tests of fields resolving in grouping
 2004-08-23 22:31:01 +03:00
mskold@mysql.com
9ad2448606 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-08-23 20:33:38 +02:00
gluh@gluh.mysql.r18.ru
b1847f471c Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
 2004-08-23 20:18:24 +04:00
gluh@gluh.mysql.r18.ru
7b17daf21e Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results(for 4.1 tree) 2004-08-23 20:17:14 +04:00
vva@eagle.mysql.r18.ru
237615bc53 fixed a Bug #4998 "--protocol doesn't reject bad values" 2004-08-23 20:55:09 +05:00
mskold@mysql.com
c644595dac Fix for bug#5171 2004-08-23 17:24:03 +02:00
guilhem@mysql.com
7bfc78f573 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-08-23 17:16:22 +02:00
gluh@gluh.mysql.r18.ru
7ff0c3978c Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0
 2004-08-23 19:16:21 +04:00
gluh@gluh.mysql.r18.ru
23535cce16 Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns 
wrong results
 2004-08-23 19:13:47 +04:00
bar@mysql.com
1ffd4d6129 show_check.test, show_check.result: 
Don't do this test for now: it fails on Mac OSX.
 2004-08-23 20:12:40 +05:00
bar@mysql.com
0983295859 Bug#4594: column index make = failed for gbk, but like works 
Fix for HEAP+HASH prefix keys.
 2004-08-23 20:12:39 +05:00
heikki@hundin.mysql.fi
5b165c75d0 innodb.result, innodb.test: 
Fix mysql-test failure in the 5.0 tree on Aug 23: label seems to be a reserved word in 5.0, and we to use it a s a column name we must but it inside backticks
 2004-08-23 18:01:22 +03:00
guilhem@mysql.com
252ebd2b30 Fix for BUG#5033 "When using temporary tables truncate does NOT reset the auto_increment counter" 
(ok'd by CTO to fix it in 4.0).
Fix to make mysql-test-run work with all Valgrind versions.
 2004-08-23 16:15:57 +02:00
pem@mysql.com
66a3f65d98 Fixed: BUG#5135: cannot turn on log_warnings with SET in 4.1 (and 4.0) 2004-08-23 15:29:55 +02:00
bell@sanja.is.com.ua
3ca433e332 merge 2004-08-23 15:50:59 +03:00
bell@sanja.is.com.ua
0264ade412 fixed LIMIT clause printing (BUG#4839) 2004-08-23 13:19:59 +03:00
bell@sanja.is.com.ua
618e65cd28 fixed error processing of prepare in VIEW creation (BUG#4801) 2004-08-23 12:38:55 +03:00
sergefp@mysql.com
263f2e3fe2 Fix for bug#5088: 
* When executing EXPLAIN, do the same as for the query: convert join type to JT_CONST if keyuse array covers all key parts and all of them are constants.
 * In remove_const, don't remove conditions that depend on some-const-table and current-table.
 2004-08-23 12:31:56 +04:00
bell@sanja.is.com.ua
74d7a092b2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-08-23 10:59:35 +03:00
serg@serg.mylan
326992430f check for mysql_bin_log.is_open() before my_b_tell(&thd->transaction.trans_log 
in ha_commit_trans - why it didn't crash earlier ?
 2004-08-22 14:23:52 +02:00
hf@deer.(none)
6c136f99bf Proposed fix for bug #5003 (subselect with MIN() and LIKE crashes server) 
We have next problem here:
active_index is wrong in the subselect's handler on the second val_int() call.
Optimizer sees that we can use index-read for that kind of condition,
and matching_cond() (sql/opt_sum.cc) doesn't. I suspect, proper solution is
to add appropriate code to the matching_cond() but now just added
missed initialization.
 2004-08-22 00:06:19 +05:00
igor@rurik.mysql.com
4b760fcb94 null.test, null.result: 
Added test case for bug #4256.
join_outer.result:
  Fixed bug #4256.
item_cmpfunc.h:
  Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects.
  This inconsistency caused bug #4256.
 2004-08-20 23:48:30 -07:00
igor@rurik.mysql.com
02f9e068b9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-08-20 16:32:40 -07:00
konstantin@mysql.com
75454b0a1d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/work/mysql-4.1-4912
 2004-08-21 02:08:20 +04:00
konstantin@mysql.com
568c6e8526 Fix for bug#4912 "mysqld crashs in case a statement is executed 
a second time". The bug was caused by incompatibility of
negations elimination algorithm and PS: during first statement 
execute a subtree with negation was replaced with equivalent 
subtree without NOTs.
The problem was that although this transformation was permanent, 
items of the new subtree were created in execute-local memory.
The patch adds means to check if it is the first execute of a
prepared statement, and if this is the case, to allocate items
in memory of the prepared statement.
The implementation:
- backports Item_arena from 5.0
- adds Item_arena::is_stmt_prepare(), 
  Item_arena::is_first_stmt_execute().
- deletes THD::allocate_temporary_pool_for_ps_preparing(),
  THD::free_temporary_pool_for_ps_preparing(); they
  were redundant.
and adds a few invariants:
- thd->free_list never contains junk (= freed items)
- thd->current_arena is never null. If there is no
  prepared statement, it points at the thd. 
The rest of the patch contains mainly mechanical changes and
cleanups.
 2004-08-21 02:02:46 +04:00
igor@rurik.mysql.com
3862914416 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-08-20 14:09:50 -07:00
serg@serg.mylan
949348f576 after merge fix 2004-08-20 22:54:42 +02:00
serg@serg.mylan
050bf6a89f merged 2004-08-20 21:56:29 +02:00
igor@rurik.mysql.com
433206c1f2 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2004-08-20 12:31:57 -07:00
bar@mysql.com
7a27f2ce8c Bug#4594 "column index make = failed for gbk, but like works" 
Fix for MyISAM. Tests for MyISAM and HASH+BTREE.
 2004-08-20 21:29:36 +05:00
dlenev@brandersnatch.localdomain
b4105df897 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4302
 2004-08-20 19:30:45 +04:00
guilhem@mysql.com
02e93b5758 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-08-20 17:16:03 +02:00
guilhem@mysql.com
5db56a106b Making FLUSH TABLES WITH READ LOCK block COMMITs of existing transactions, 
in a deadlock-free manner. This splits locking the global read lock in two steps.
This fixes a consequence of this bug, known as:
BUG#4953 'mysqldump --master-data may report incorrect binlog position if using InnoDB'
And a test.
 2004-08-20 16:35:23 +02:00
dlenev@brandersnatch.localdomain
c8882165f3 Fix for bug#4302 "ambiguos order by when renamed column is identical to another in result" 
When in find_item_in_list() we are looking for item we should take into account unaliased 
names of the fields but only if item with such aliased name is not found.
Also we should ignore aliases when looking for fully specified field.
 2004-08-20 17:53:46 +04:00
mskold@mysql.com
6f8ebb4798 Merge mskold@build.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-08-20 06:51:02 +02:00
serg@serg.mylan
62722e7b05 merged 2004-08-20 00:52:43 +02:00
serg@serg.mylan
22546845f2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-19 23:45:44 +02:00
guilhem@mysql.com
0db5b4d202 (manual port from 4.0 - was needed) 
Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DELETE in binlog)":
replacing the no_log argument of mysql_create_table() by some safer method
(temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic
DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table
is opened by mysql_create_table().
 2004-08-19 23:24:35 +02:00
serg@serg.mylan
b81af1c750 less strict assert to take into account weird cases 2004-08-19 23:10:33 +02:00
mskold@mysql.com
ba924c0a40 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
 2004-08-19 21:37:58 +02:00
serg@serg.mylan
68bc1c28a4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-19 18:42:01 +02:00
serg@serg.mylan
a29c9d3707 Bug #4769 - ft in subqueries 2004-08-19 18:40:15 +02:00
mskold@mysql.com
8d73def948 New result due to changed output from SHOW TABLES 2004-08-19 14:40:10 +02:00
bar@mysql.com
d81136e3e1 Bug 4531: unique key prefix interacts poorly with utf8 
Check HEAP+HASH, binary collation
 2004-08-19 16:07:18 +05:00
bar@mysql.com
a7510c70fc Fix trailing spaces behaviour for binary collation. 2004-08-19 15:21:35 +05:00
bar@mysql.com
2496e85b84 Bug#4521: unique key prefix interacts poorly with utf8. 
Fix for binary collations for MyISAM and HEAP BTREE.
This patch also changes trailing spaces behaviour for
binary collations. Binary collations now have PAD 
characteristic too.
 2004-08-19 15:15:10 +05:00
bar@mysql.com
6b90806a4a ctype_utf8.test, ctype_utf8.result: 
Typo fix
 2004-08-19 15:00:55 +05:00
mskold@mysql.com
59c9bcb366 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
 2004-08-19 11:13:49 +02:00
bar@mysql.com
7f92905954 Bug#5081: UCS2 fields are filled with '0x2020' after extending field length 2004-08-19 11:59:33 +05:00