mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 14:32:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35747 commits 2783 branches 343 tags 1.6 GiB
Commit graph

12688 commits

Author SHA1 Message Date
gluh@eagle.intranet.mysql.r18.ru
4c746fdb8e test fix(to satisfy Win) 2006-06-22 19:20:29 +05:00
andrey@lmy004.
50c7663dbc fix for bug#20624: events_logs_tests.test fails randomly 
(this is a change to a faulty test file)
 2006-06-22 16:13:18 +02:00
mikael@dator5.(none)
59e0502e52 BUG#17138: Stored procedure error 
Review fixes
 2006-06-22 10:01:30 -04:00
bar@bar.intranet.mysql.r18.ru
025180044e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt 
into  mysql.com:/usr/home/bar/mysql-5.1.b20086
 2006-06-22 18:55:44 +05:00
bar@bar.intranet.mysql.r18.ru
5694d5a63c Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt 
into  mysql.com:/usr/home/bar/mysql-5.1.b20086
 2006-06-22 18:51:50 +05:00
bar@bar.intranet.mysql.r18.ru
ac487f52aa Merge mysql.com:/usr/home/bar/mysql-5.1-new.19392 
into  mysql.com:/usr/home/bar/mysql-5.1-kt
 2006-06-22 18:38:26 +05:00
cmiller@zippy.(none)
0f4e09a81a Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug19904
 2006-06-22 08:58:37 -04:00
jonas@perch.ndb.mysql.com
92addc582b Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-06-22 13:53:59 +02:00
jonas@perch.ndb.mysql.com
ef892289cf fix result file for ndb_dd_ddl 2006-06-22 13:53:02 +02:00
andrey@lmy004.
c59a58c4ba fix for bug#16992 (Events: Information_schema troubles) 
Introduced EVENTS.EVENT_DEFINITION, like ROUTINES.ROUTINE_DEFINITION
Hence, the contents of the current EVENTS.EVENT_BODY become the contents
of EVENT_DEFINITION. EVENT_BODY will contain always, for now, "SQL" (wo
quotes).
 2006-06-22 13:01:08 +02:00
monty@mysql.com
b8ab496057 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-22 12:21:41 +03:00
jonas@perch.ndb.mysql.com
f618c9ed8f Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-06-22 10:52:45 +02:00
jonas@perch.ndb.mysql.com
dc75269965 ndb - bug#16341 
create tablespace/logfile group should "back out changes"
 2006-06-22 10:24:44 +02:00
igor@rurik.mysql.com
85f0e50ab3 Merge rurik.mysql.com:/home/igor/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-06-21 22:41:51 -07:00
igor@rurik.mysql.com
e307b5b297 Modified the test case for bug 16674 to have the same 
execution plans in 4.1 and 5.0.
 2006-06-21 22:39:48 -07:00
igor@rurik.mysql.com
9631db0620 Merge rurik.mysql.com:/home/igor/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-06-21 20:06:33 -07:00
mikael@dator5.(none)
c91d6eb7b8 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug17138
 2006-06-21 21:24:04 -04:00
mikael@dator5.(none)
a8e6967c02 BUG#17138: Error in stored procedure 
Review comments
 2006-06-21 20:55:33 -04:00
igor@rurik.mysql.com
cfd2c2a569 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-4.1-opt
 2006-06-21 16:29:58 -07:00
rburnett@bk-internal.mysql.com
d9fb74e40e Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-06-22 01:25:57 +02:00
mikael@dator5.(none)
9543cae6cf Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug19281
 2006-06-21 19:25:56 -04:00
mikael@dator5.(none)
cb5043199b mmanual merge 2006-06-21 19:08:30 -04:00
evgen@moonbone.local
c948256692 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-22 01:16:57 +04:00
evgen@moonbone.local
6439337bb1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-06-22 00:29:47 +04:00
evgen@moonbone.local
8d4a910a1f Fixed bug #14896. 
This bug in Field_string::cmp resulted in a wrong comparison 
with keys in partial indexes over multi-byte character fields.
Given field a is declared as a varchar(16) collate utf8_unicode_ci
INDEX(a(4)) gives us an example of such an index.
  
Wrong key comparisons could lead to wrong result sets if 
the selected query execution plan used a range scan by 
a partial index over a utf8 character field.
This also caused wrong results in many other cases.
 2006-06-22 00:29:04 +04:00
rburnett@bk-internal.mysql.com
8472ce9ff8 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-06-21 17:51:54 +02:00
mikael@dator5.(none)
eab0cfbc25 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug19281
 2006-06-21 11:41:06 -04:00
monty@mysql.com
bb02e07777 Change table_id's to # to make tests portable 2006-06-21 18:27:45 +03:00
cmiller@zippy.(none)
1dd674ef8a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
 2006-06-21 11:07:34 -04:00
svoj@may.pils.ru
ffd8ea244d Merge may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-5.0
 2006-06-21 19:41:09 +05:00
svoj@may.pils.ru
fedbbf4865 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1
 2006-06-21 19:41:08 +05:00
tomas@poseidon.ndb.mysql.com
5f46cb7e1a added missing MYSQLTEST_VARDIR declaration 2006-06-21 16:41:07 +02:00
ramil@myoffice.izhnet.ru
3228ce7f9e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/usr/home/ram/work/mysql-5.1
 2006-06-21 19:14:59 +05:00
rburnett@bk-internal.mysql.com
5a558eaf89 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-06-21 15:33:22 +02:00
lars@mysql.com
207c0baf45 After merge fix 2006-06-21 15:30:26 +02:00
ramil@mysql.com
db2acfc926 Fix for bug #20601: rpl_ndb_log.test failure 2006-06-21 18:16:07 +05:00
svoj@may.pils.ru
e560564cfa Merge april:devel/BitKeeper/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1
 2006-06-21 17:51:16 +05:00
svoj@may.pils.ru
8b98be2844 BUG#20357 - Got error 124 from storage engine using MIN and MAX 
functions in queries

Using MAX()/MIN() on table with disabled indexes (by ALTER TABLE)
results in error 124 (wrong index) from storage engine.

The problem was that optimizer use disabled index to optimize
MAX()/MIN(). Normally it must skip disabled index and perform
table scan.

This patch skips disabled indexes for min/max optimization.
 2006-06-21 17:30:59 +05:00
anozdrin@mysql.com
6ed2ec688d Merge mysql.com:/mnt/raid/alik/MySQL/devel/5.1-tree 
into  mysql.com:/mnt/raid/alik/MySQL/devel/5.1-rt-bug20294
 2006-06-21 16:17:51 +04:00
lars@mysql.com
6b8c196584 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-06-21 14:14:37 +02:00
anozdrin@mysql.com
ce8734699b Fix for BUG#20294: Instance manager test im_instance_conf 
fails randomly.

The problem is that the test was affected by other running
test-suites on the same box. The fix affects the test only,
no code touched.
 2006-06-21 16:02:51 +04:00
lars@dl145j.mysql.com
ed0e98529c Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-06-21 13:51:28 +02:00
lars@mysql.com
6839e64298 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-21 13:42:02 +02:00
knielsen@mysql.com
66bdb6de02 Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-5.0 
into  mysql.com:/data0/knielsen/mysql-5.0
 2006-06-21 12:59:19 +02:00
knielsen@mysql.com
8167b2c8ef BUG#20578 
Backport Valgrind suppression from mysql-5.1:

D 1.4 05/11/23 22:44:54+02:00 monty@mysql.com 5 4 12/0/154
P mysql-test/valgrind.supp
C Remove warning that may happens becasue threads dies in different order
 2006-06-21 12:52:59 +02:00
monty@narttu.mysql.fi
20c00662eb Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-21 13:24:56 +03:00
gkodinov@mysql.com
bca6492927 Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean 
into  mysql.com:/home/kgeorge/mysql/5.0/B18080
 2006-06-21 13:06:32 +03:00
mskold@mysql.com
22334907fc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-06-21 12:03:08 +02:00
gkodinov@mysql.com
f327a8c536 merge of the changes for bug #18080 2006-06-21 13:03:06 +03:00
gkodinov@mysql.com
4f8f4cd51a manual merge 2006-06-21 13:01:00 +03:00
gkodinov@mysql.com
bee985af35 Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean 
into  mysql.com:/home/kgeorge/mysql/5.0/B20482
 2006-06-21 12:59:34 +03:00
gluh@eagle.intranet.mysql.r18.ru
8097ba2046 after merge fixes 2006-06-21 14:53:40 +05:00
gkodinov@mysql.com
75ca055493 Bug #20482: failure on Create join view with sources views/tables in different 
schemas
The function check_one_table_access() called to check access to tables in 
SELECT/INSERT/UPDATE was doing additional checks/modifications that don't hold
in the context of setup_tables_and_check_access().
That's why the check_one_table() was split into two : the functionality needed by
setup_tables_and_check_access() into check_single_table_access() and the rest of 
the functionality stays in check_one_table_access() that is made to call the new
check_single_table_access() function.
 2006-06-21 12:12:46 +03:00
mskold@linux.site
7704d973d4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-06-21 10:10:01 +02:00
bar@mysql.com
bfae7303d7 Bug#20086: Can't get data from key partitioned tables with VARCHAR key 
The problem appeared because the same values produced different hash
during INSERT and SELECT for VARCHAR data type.
Fix:
VARCHAR required special treatment to avoid hashing of length bytes
(leftmost one or two bytes) as well as trailing bytes beyond real length,
which could contain garbage. Fix is done by introducing hash() - new method
in the Field class.
 2006-06-21 13:00:19 +05:00
mskold@mysql.com
f0bd8a7cd9 Merge mysql.com:/home/marty/MySQL/mysql-5.0-backed 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-06-21 09:50:41 +02:00
anozdrin@mysql.com
5ce56c1cdc Disable IM tests. 2006-06-21 11:44:54 +04:00
mskold@mysql.com
bd3f9cc0a5 Merge mysql.com:/home/marty/MySQL/mysql-5.0-backed 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-06-21 09:42:15 +02:00
mskold@mysql.com
e77850e573 Fix for Bug #19906 REPLACE doesn't update TEXT fields correctly 2006-06-21 09:36:50 +02:00
igor@rurik.mysql.com
5e8d011c3a Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-4.1-opt
 2006-06-20 22:15:30 -07:00
ramil@mysql.com
81277475f8 Merge mysql.com:/usr/home/ram/work/mysql-4.1 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-06-21 09:16:22 +05:00
igor@rurik.mysql.com
2893d11c5e Fixed bug #16674. 
The length of the prefix of the pattern string in the LIKE predicate that 
determined the index range to be scanned was calculated incorrectly for
multi-byte character sets. 
As a result of this in 4. 1 the the scanned range was wider then necessary
if the prefix contained not only one-byte characters.  
In 5.0 additionally it caused missing some rows from the result set.
 2006-06-20 19:57:21 -07:00
anozdrin@mysql.com
bb94cb24c5 Re-enable IM tests. 2006-06-21 02:17:39 +04:00
anozdrin@mysql.com
ddaebd13dc Fix merge 5.0 -> 5.1. 2006-06-21 02:16:38 +04:00
anozdrin@booka.site
3a6ad23f43 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/alik/MySQL/devel/5.1-merged
 2006-06-21 02:00:49 +04:00
dlenev@mysql.com
b75254e101 Fix for bug#19634 "Re-execution of multi-delete which involve trigger/stored 
function crashes server".

Attempts to execute prepared multi-delete statement which involved trigger or
stored function caused server crashes (the same happened for such statements
included in stored procedures in cases when one tried to execute them more
than once).

The problem was caused by yet another incorrect usage of check_table_access()
routine (the latter assumes that table list which it gets as argument
corresponds to value LEX::query_tables_own_last). We solve this problem by
juggling with LEX::query_tables_own_last value when we call
check_table_access() for LEX::auxilliary_table_list (better solution is too
intrusive and should be done in 5.1).
 2006-06-21 01:50:20 +04:00
cmiller@zippy.(none)
deca07bdcc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
 2006-06-20 17:17:04 -04:00
evgen@moonbone.local
8c0aa3560c field.cc, field.h: 
Additional fix for #16377 for bigendian platforms
sql_select.cc, select.result, select.test:
  After merge fix
 2006-06-21 01:14:53 +04:00
evgen@moonbone.local
278b26a39b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-21 01:10:59 +04:00
mikael@dator5.(none)
cd93441a0a Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug17138
 2006-06-20 16:59:51 -04:00
evgen@moonbone.local
6b694bcd58 rpl_ndb_log.result: 
Corrected test case result
 2006-06-21 00:45:01 +04:00
mikael@dator5.(none)
da260e9e3f Merge dator5.(none):/home/pappa/bug16000 
into  dator5.(none):/home/pappa/bug19281
 2006-06-20 16:43:25 -04:00
mikael@dator5.(none)
a3d5c3bf6d BUG#16000: .par file left behind plus unnecessary messages to error.log 
New test cases
 2006-06-20 16:38:42 -04:00
evgen@moonbone.local
52d86dff85 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-06-20 23:49:33 +04:00
evgen@moonbone.local
bb53b6eeaa Manually merged 2006-06-20 23:22:51 +04:00
mikael@dator5.(none)
4f599159c7 Merge dator5.(none):/home/pappa/bug19309 
into  dator5.(none):/home/pappa/bug19281
 2006-06-20 15:18:16 -04:00
mikael@dator5.(none)
39b9c16e1a Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug19309
 2006-06-20 15:13:44 -04:00
mikael@dator5.(none)
4dd8f90912 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug19281
 2006-06-20 15:09:48 -04:00
evgen@moonbone.local
ae6970e6bc select.result: 
Added test case for bug#18759 Incorrect string to numeric conversion.  
select.test:
  Added test case for bug#18759 Incorrect string to numeric conversion.
item_cmpfunc.cc:
  Cleanup after fix for bug#18360 removal
 2006-06-20 23:05:55 +04:00
evgen@moonbone.local
1e0138fd3d Manually merged 2006-06-20 22:22:14 +04:00
elliot@mysql.com
37e5ec9f50 Applying patch from SergeyV 
Fixes bug#17264, for alter table on win32 for successfull operation completion
it is used TL_WRITE(=10) lock instead of TL_WRITE_ALLOW_READ(=6), however here
in innodb handler TL_WRTIE is lifted to TL_WRITE_ALLOW_WRITE, which causes
race condition when several clients do alter table simultaneously.
 2006-06-20 13:43:13 -04:00
evgen@moonbone.local
66371d22e2 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
 2006-06-20 20:13:37 +04:00
evgen@moonbone.local
75164ffc2f rpl_ndb_log.result: 
Fixed failing test case
 2006-06-20 20:11:08 +04:00
rburnett@bk-internal.mysql.com
154961b26a Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-06-20 18:06:22 +02:00
anozdrin@mysql.com
42ef881906 Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-merged 
into  mysql.com:/home/alik/MySQL/devel/5.1-merged
 2006-06-20 18:28:28 +04:00
mikael@dator5.(none)
805ba2462e Fixed test case 2006-06-20 10:16:08 -04:00
mikael@dator5.(none)
e8d39758c7 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug19281
 2006-06-20 10:08:30 -04:00
mikael@dator5.(none)
75f3586117 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug17138
 2006-06-20 08:53:12 -04:00
rburnett@bk-internal.mysql.com
2d6fb900eb Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-06-20 14:51:32 +02:00
svoj@may.pils.ru
1c42c9730d Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
 2006-06-20 16:45:51 +05:00
evgen@sunlight.local
d0d32f7d11 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into sunlight.local:/home/evgen/tmp_merge-5.0-opt-mysql
 2006-06-20 15:44:33 +04:00
evgen@moonbone.local
314b897fbf func_time.result: 
After merge fix
 2006-06-20 15:35:54 +04:00
monty@mysql.com
be269e56d2 SHOW STATUS does not anymore change local status variables (except com_show_status). Global status variables are still updated. 
SHOW STATUS are not anymore put in slow query log because of no index usage.

Implemntation done by removing orig_sql_command and moving logic of SHOW STATUS to mysql_excute_command()
This simplifies code and allows us to remove some if statements all over the code.

Upgraded uc_update_queries[] to sql_command_flags and added more bitmaps to better categorize commands.
This allowed some overall simplifaction when testing sql_command.

Fixes bugs:
Bug#10210: running SHOW STATUS increments counters it shouldn't
Bug#19764: SHOW commands end up in the slow log as table scans
 2006-06-20 13:20:32 +03:00
kent@mysql.com
8f0aa436ed Merge 2006-06-20 11:11:18 +02:00
ramil@mysql.com
d1fcc620d8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/mysql-4.1
 2006-06-20 09:35:25 +05:00
stewart@mysql.com
0d7ea0acd4 fix test result after BUG#20073 fix 2006-06-20 14:24:52 +10:00
mikael@dator5.(none)
5254e3be5c New test case 2006-06-19 23:13:42 -04:00
mikael@dator5.(none)
529ab385a1 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug17138
 2006-06-19 22:52:31 -04:00
mikael@dator5.(none)
8bd81e1fee BUG#17138: Error in stored procedure due to fatal error when not really 
a fatal error. New handling of ignore error in place.
 2006-06-19 20:56:50 -04:00
lars@mysql.com
cf2b170d00 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-20 00:08:12 +02:00
evgen@moonbone.local
217faf569e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-06-20 02:04:36 +04:00
evgen@moonbone.local
609e0dbd99 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-06-20 01:56:33 +04:00
anozdrin@booka.site
f237fa7840 Merge mysql.com:/home/alik/MySQL/devel/5.1-tree 
into  mysql.com:/home/alik/MySQL/devel/5.1-rt
 2006-06-20 00:54:51 +04:00
evgen@moonbone.local
de8f05956d Merge 2006-06-20 00:52:26 +04:00
evgen@moonbone.local
279c310b66 item_cmpfunc.cc, func_in.result, func_in.test: 
Reverted fix for bug#18360
 2006-06-20 00:50:09 +04:00
evgen@sunlight.local
6e80c3ec42 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-06-19 22:23:41 +04:00
evgen@moonbone.local
9c324f32e7 rpl_row_log.result, rpl_row_log_innodb.result: 
Fixed failing test case
 2006-06-19 20:21:00 +04:00
rburnett@bk-internal.mysql.com
3edd9cc9c4 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-06-19 17:50:11 +02:00
svoj@may.pils.ru
6124539b0f Merge april:devel/BitKeeper/mysql-5.1-engines 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
 2006-06-19 19:57:42 +05:00
gkodinov@mysql.com
5508df251f Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error 
There was an incomplete reset of the name resolution context, that caused 
INSERT ... SELECT ... JOIN statements to resolve not by joint row type calculated
for the join.
Removed the redundant re-initialization of the context, because 
mysql_insert_select_prepare() now correctly saves/restores the context.
 2006-06-19 17:34:12 +03:00
bar@bar.intranet.mysql.r18.ru
34b15e6a05 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt 
into  mysql.com:/usr/home/bar/mysql-5.1-kt
 2006-06-19 19:32:08 +05:00
bar@bar.intranet.mysql.r18.ru
9ea82d3566 Merge mysql.com:/usr/home/bar/mysql-5.1-new.b18396 
into  mysql.com:/usr/home/bar/mysql-5.1-kt
 2006-06-19 19:15:03 +05:00
anozdrin@mysql.com
e420873370 Merge mysql.com:/home/alik/MySQL/devel/5.0-rt 
into  mysql.com:/home/alik/MySQL/devel/5.0-tree-merged
 2006-06-19 18:10:04 +04:00
gluh@mysql.com
c106b08308 after merge fix 2006-06-19 18:36:27 +05:00
gluh@eagle.intranet.mysql.r18.ru
1d72c66c1b WL#3015: Logging Improvements - No Restarts(ver N4) 
Added slow_query_log & general_log global upadatable variables.
Added slow-query-log & general-log startup options.
Added log_output, general_log_file, slow_query_log_file global updatable variables.
 2006-06-19 18:30:55 +05:00
anozdrin@mysql.com
4afffb40a8 Merge mysql.com:/home/alik/MySQL/devel/5.0-tree 
into  mysql.com:/home/alik/MySQL/devel/5.0-rt
 2006-06-19 16:57:46 +04:00
cmiller@bk-internal.mysql.com
b0ebd2fce0 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-maint
 2006-06-19 14:38:57 +02:00
lars@mysql.com
ad809c6b15 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-19 13:30:54 +02:00
lars@mysql.com
67e476f29f BUG#17201 Changed to other database (BUG#20531 hinders usage of 'test' database) 2006-06-19 13:23:13 +02:00
svoj@may.pils.ru
6a90aede13 Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
 2006-06-19 16:06:29 +05:00
anozdrin@mysql.com
3b6397b1d2 WL#3298: IM: make command-line option names consistent 
1. Removed '-P' command line option;
2. Renamed '--passwd' command line option to '--print-password-line'.
 2006-06-19 14:41:29 +04:00
gkodinov@mysql.com
6777928eec Merge mysql.com:/home/kgeorge/mysql/4.1/teamclean 
into  mysql.com:/home/kgeorge/mysql/4.1/B9676
 2006-06-19 13:25:28 +03:00
gkodinov@mysql.com
c5ed7a87f4 * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big 
tables
Currently in INSERT ... SELECT ... LIMIT ... the compiler uses a 
temporary table to store the results of SELECT ... LIMIT .. and then
uses that table as a source for INSERT. The problem is that in some cases
it actually skips the LIMIT clause in doing that and materializes the 
whole SELECT result set regardless of the LIMIT.
This fix is limiting the process of filling up the temp table with only 
that much rows that will be actually used by propagating the LIMIT value.
 2006-06-19 13:22:42 +03:00
anozdrin@mysql.com
a142a4d97b Small fix for test suite: 
- fix for IM stopping routine;
  - polishing.
 2006-06-19 14:15:26 +04:00
lars@dl145j.mysql.com
9bf46d4844 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-06-19 12:14:38 +02:00
anozdrin@mysql.com
2e56e82180 Fix of test suite in scope of fixing BUG#18023: IM: instance 
can be started several times; monitor interval must be > 2sec
 2006-06-19 14:13:34 +04:00
lars@mysql.com
5937422a53 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-19 12:09:24 +02:00
bar@mysql.com
013fb25ff4 Additional fix for 18201 XML: ExtractValue works even if the xml fragment is not well-formed xml 
Changing error number
 2006-06-19 14:17:04 +05:00
svoj@may.pils.ru
737e166403 Merge april:devel/BitKeeper/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1
 2006-06-19 14:13:44 +05:00
svoj@may.pils.ru
37cdb0fbf3 BUG#18036 - update of table joined to self reports table as crashed 
Certain updates of table joined to self results in unexpected
behavior.

The problem was that record cache was mistakenly enabled for
self-joined table updates. Normally record cache must be disabled
for such updates.

Fixed wrong condition in code that determines whether to use
record cache for self-joined table updates.

Only MyISAM tables were affected.
 2006-06-19 14:05:14 +05:00
ramil@mysql.com
49797c23b3 Fix for bug #20496: func_time.test failure 2006-06-19 13:03:29 +05:00
mats@mysql.com
da98424d6c Replication/Backup Team Tree test fixing. 2006-06-19 09:25:49 +02:00
bar@bar.intranet.mysql.r18.ru
f3bda9b73f Merge mysql.com:/usr/home/bar/mysql-5.1-new.b18201 
into  mysql.com:/usr/home/bar/mysql-5.1-kt
 2006-06-19 11:18:05 +05:00
evgen@moonbone.local
c0850425e5 rpl_log.test, rpl_stm_log.result: 
Fixed failing test case
field.cc, item_cmpfunc.cc, select.result:
  After merge fix
 2006-06-19 04:26:27 +04:00
evgen@moonbone.local
a92a55bb97 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-19 01:16:18 +04:00
evgen@moonbone.local
79c91f6214 Manually merged 2006-06-18 14:56:35 +04:00
evgen@moonbone.local
09e84bf484 Merge moonbone.local:/work/tmp_merge-5.0 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-17 03:35:10 +04:00
evgen@moonbone.local
1aedd2ed3e Manually merged 2006-06-17 02:57:50 +04:00
evgen@moonbone.local
59b204fe08 select.result: 
After merge fix
 2006-06-17 02:52:14 +04:00
evgen@moonbone.local
7f24667598 Manually merged 2006-06-17 02:11:12 +04:00
evgen@moonbone.local
592e080643 Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-17 01:57:25 +04:00
evgen@moonbone.local
28cf3c3e64 Manually merged 2006-06-17 00:58:36 +04:00
petr@outpost.site
86f2f5828d Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
 2006-06-16 23:39:09 +04:00
dlenev@mysql.com
59d20e26d5 Fix for bug#13479 "REPLACE activates UPDATE trigger, not the DELETE and 
INSERT triggers".

In cases when REPLACE was internally executed via update and table had
on update (on delete) triggers defined we exposed the fact that such
optimization used by callng on update (not calling on delete) triggers.
Such behavior contradicts our documentation which describes REPLACE as
INSERT with optional DELETE.

This fix just disables this optimization for tables with on delete triggers.
The optimization is still applied for tables which have on update but have
no on delete triggers, we just don't invoke on update triggers in this case
and thus don't expose information about optimization to user.

Also added test coverage for values returned by ROW_COUNT() function (and
thus for values returned by mysql_affected_rows()) for various forms of
INSERT.
 2006-06-16 20:21:25 +04:00
msvensson@neptunus.(none)
104748ddaf Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-06-16 17:30:03 +02:00
msvensson@neptunus.(none)
0a15f9d0bf Set default valgrind options to "-v --show-reachable=yes" and make it possible to override that with --valgrind-options 2006-06-16 15:56:08 +02:00
ramil@mysql.com
10914578f1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-06-16 16:43:44 +05:00
ramil@mysql.com
7e8a2ec6bb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-06-16 15:27:04 +05:00
mats@mysql.com
a424aa339e Fixes in tests for Replication/Backup Team Tree. 2006-06-16 11:10:37 +02:00
ramil@mysql.com
f2899063ee after-merge fixes. 2006-06-16 14:05:58 +05:00