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

36479 commits

This branch
This branch
All branches
Author SHA1 Message Date
evgen@sunlight.local
a8405f650d func_str.result: 
After merge fix
 2006-08-01 18:55:44 +04:00
evgen@sunlight.local
dda7a95c59 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-08-01 09:24:19 +04:00
evgen@sunlight.local
799ecc9f2a After merge fix 2006-08-01 08:49:43 +04:00
evgen@sunlight.local
1007b441df Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-07-31 23:49:52 +04:00
evgen@moonbone.local
b43b2a2fe0 select.result, func_group.result, sql_select.cc: 
After merge fix
 2006-07-31 23:05:54 +04:00
sergefp@mysql.com
6056f7714e BUG#14940: Post-merge fixes: update test results 2006-07-31 22:22:01 +04:00
sergefp@mysql.com
05f7872124 BUG#14940: Post-merge fixes 2006-07-30 18:25:57 +04:00
evgen@sunlight.local
ef4f149536 Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-07-30 00:33:24 +04:00
sergefp@newbox.mylan
ee3c1deed4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/psergey/mysql-5.1-bug14940-r4
 2006-07-30 00:02:42 +04:00
sergefp@mysql.com
cbd57af8ed BUG#14940: post-review fixes 2006-07-30 00:02:09 +04:00
evgen@sunlight.local
3ca575dc89 Merge sunlight.local:/local_work/tmp_merge-4.1-opt-mysql 
into  sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
 2006-07-29 23:59:53 +04:00
evgen@sunlight.local
8cd88a9179 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-07-29 23:54:55 +04:00
evgen@sunlight.local
285e392512 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  sunlight.local:/home/evgen/bk-trees/mysql-5.1-opt
 2006-07-29 23:44:40 +04:00
jimw@rama.(none)
69f9fe7531 Fix tests after merge and disable rpl_ndb_dd_advance due to bug 18679. 2006-07-28 19:39:34 -07:00
jimw@rama.(none)
f7e19b40f3 Merge rama.(none):/home/jimw/my/tmp_merge 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-07-28 15:51:48 -07:00
sergefp@mysql.com
699291a8e6 BUG#14940 "MySQL choose wrong index", v.2 
- Make the range-et-al optimizer produce E(#table records after table 
                                           condition is applied),
- Make the join optimizer use this value,
- Add "filtered" column to EXPLAIN EXTENDED to show 
  fraction of records left after table condition is applied
- Adjust test results, add comments
 2006-07-28 21:27:01 +04:00
kostja@bodhi.local
4bd7acec3f Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-07-28 18:02:38 +04:00
kostja@bodhi.local
131e3b0607 Add sql_locale.cc to cmake scripts. 2006-07-28 16:37:16 +04:00
kostja@bodhi.local
024960aa2d Post-merge fixes. 2006-07-27 14:12:41 +04:00
msvensson@neptunus.(none)
fdfad1d063 Bug#21297 rpl_insert fails randomly 
- Add loop in mysqlslap that tries to connect up to 10 times if connect
   in thread fails.
 2006-07-27 10:54:04 +02:00
msvensson@neptunus.(none)
279dd5c73d Increase time to sleep to allow mysqlds to exit from readonly mode 2006-07-27 09:15:05 +02:00
gkodinov/kgeorge@rakia.(none)
21e6d13147 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B21019-5.0-opt
 2006-07-27 10:11:13 +03:00
gkodinov/kgeorge@rakia.(none)
351554e121 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B20792-4.1-opt
 2006-07-27 10:06:37 +03:00
gkodinov/kgeorge@rakia.(none)
778dd354e3 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B20792-5.0-opt
 2006-07-27 10:05:03 +03:00
msvensson@neptunus.(none)
705db761b9 Bug#21298 ndbcluster_log_schema_op locks already freed mutex 
- Disable 3 test cases that crashes slave
 2006-07-27 09:02:44 +02:00
msvensson@neptunus.(none)
e47f61a01c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-07-27 05:55:42 +02:00
kostja@bodhi.local
73189969f3 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-07-26 23:33:25 +04:00
pekka@orca.ndb.mysql.com
4a1bf59e22 Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my51 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug14935
 2006-07-26 20:40:20 +02:00
pekka@orca.ndb.mysql.com
a920df9c04 ndb - bug#14935 - post-review 2006-07-26 20:03:41 +02:00
kostja@bodhi.local
bea330494c Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-07-26 21:48:45 +04:00
evgen@moonbone.local
438f2c23ec Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/work/19862-bug-5.0-opt-mysql
 2006-07-26 21:36:33 +04:00
evgen@moonbone.local
b7ade8e408 item_func.h, item_func.cc, sql_select.cc, item.h: 
Post review changes for bug#19862.
 2006-07-26 21:36:03 +04:00
gkodinov/kgeorge@rakia.(none)
e2a082aa32 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B20792-4.1-opt
 2006-07-26 19:55:33 +03:00
gkodinov/kgeorge@macbook.gmz
609befda87 Merge macbook.gmz:/Users/kgeorge/mysql/work/B20792-4.1-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B20792-5.0-opt
 2006-07-26 19:23:44 +03:00
gkodinov/kgeorge@macbook.gmz
565d495997 * Bug #20792: Incorrect results from aggregate subquery 
When processing aggregate functions all tables values are reset
to NULLs at the end of each group. 
When doing that if there are no rows found for a group
the const tables must not be reset as they are not recalculated 
by do_select()/sub_select() for each group.
 2006-07-26 19:19:30 +03:00
gkodinov/kgeorge@rakia.(none)
49f8ec4c99 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B21019-4.1-opt
 2006-07-26 18:49:26 +03:00
gkodinov/kgeorge@macbook.gmz
334e264b5a Bug #21019: First result of SELECT COUNT(*) different than consecutive runs 
Correct merge
 2006-07-26 18:18:34 +03:00
gkodinov/kgeorge@macbook.gmz
66e65eff14 Merge macbook.gmz:/Users/kgeorge/mysql/work/B21019-4.1-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B21019-5.0-opt
 2006-07-26 17:31:34 +03:00
msvensson@neptunus.(none)
f585407eb3 Add support for valgrind with callgrind 2006-07-26 14:44:59 +02:00
msvensson@neptunus.(none)
4632f97e21 Merge 192.168.0.20:mysql/my51-m-bug21039 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-07-26 14:29:09 +02:00
msvensson@neptunus.(none)
13aba17bf3 Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060721184912|58688 2006-07-26 14:27:52 +02:00
msvensson@neptunus.(none)
a69e5dcc04 Disable rpl_insert due to bug#21297 2006-07-26 14:27:05 +02:00
msvensson@shellback.(none)
a1ec4fe7f0 Bug#21039 Transaction cache not flushed after SELECT CREATE 
- Add prelocking for stored procedures that uses sp or sf
 - Update test result for sp_error(reported as bug#21294)
 - Make note about new error message from sp-error(bug#17244)
 2006-07-26 12:40:26 +02:00
gkodinov/kgeorge@macbook.gmz
6766cfcdf9 Bug #21019: First result of SELECT COUNT(*) different than consecutive runs 
When optimizing conditions like 'a = <some_val> OR a IS NULL' so that they're
 united into a single condition on the key and checked together the server must 
 check which value is the NULL value in a correct way : not only using ->is_null 
 but also check if the expression doesn't depend on any tables referenced in the 
 current statement. 
 This additional check must be performed because that optimization takes place 
 before the actual execution of the statement, so if the field was initialized 
 to NULL from a previous statement the optimization would be applied incorrectly.
 2006-07-26 13:32:28 +03:00
msvensson@neptunus.(none)
46d63ab988 Change mtr_error to mtr_warning allowing processing to continue when mysqld fails to start 2006-07-26 12:21:34 +02:00
ingo/mydev@chilla.local
598653ce99 Disabled ndb_restore_compat for BUG#21283. 2006-07-26 11:50:13 +02:00
gkodinov/kgeorge@rakia.(none)
67dd8dce0e Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B21086-5.0-opt
 2006-07-26 11:56:39 +03:00
msvensson@neptunus.(none)
eb20bd4b78 Add printout of where error occured when printing to error log in 'im_stop' 2006-07-26 10:56:29 +02:00
msvensson@neptunus.(none)
0d177b2d85 Fix problem with detecting wheter im processes has shutdown cleanly 2006-07-26 10:35:08 +02:00
msvensson@neptunus.(none)
563a092f1f Add the instance manager to the list of processes to shutdown and ping in mtr_kill_leftovers 2006-07-26 09:53:48 +02:00