mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36117 commits 2791 branches 343 tags 1.7 GiB
Commit graph

12917 commits

Author SHA1 Message Date
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
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