1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-15 09:02:33 +03:00
Commit Graph

18065 Commits

Author SHA1 Message Date
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
igreenhoe@mysql.com
85d130c58b Fix for bug #15977 (switch ordering of DISABLE KEYS/LOCK TABLE in mysqldump) 2006-06-21 00:12:23 -07: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
ngrishakin@mysql.com
4259e69798 ndb_dd_advance2 test 2006-06-20 19:18:34 +02: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
mikael@dator5.(none)
d35c7f2f50 BUG#18198: Too flexible partition functions 2006-06-20 10:57:02 -04: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
guilhem@mysql.com
ff179e371f Fix for BUG#20522 "RBR: CREATE TEMPORARY TABLE SELECT writes to binlog
though unneeded". It's indeed unneeded, as slave is only interested in
permanent tables, and permanent tables don't depend on temporary tables
when in row-based binlogging mode. And other CREATE TEMPORARY TABLE
(referring no table or with LIKE) already don't write the CREATE to
binlog in row-based mode.
2006-06-20 10:40:36 +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
ngrishakin@ndb15.mysql.com
784233a5c1 Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1
2006-06-20 02:54:07 +02: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