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

9958 commits

Author SHA1 Message Date
serg@mysql.com
c00edb8e8a Merge mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release 
into  mysql.com:/data0/mysqldev/my/mysql-5.0.22-release
 2006-05-24 14:22:36 +02:00
serg@mysql.com
1841c44cfc Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release 
into  mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release
 2006-05-24 12:19:39 +02:00
kent@mysql.com
97674810b0 don't let bugfix for bug#8303 break the bugfix for bug#8378 
revert the fix for bug#8303
correct the test for bug#8378
 2006-05-24 00:55:53 +02:00
bell@sanja.is.com.ua
0e331dfb92 fixed error message text 2006-04-26 17:57:41 +03:00
aivanov@mysql.com
419d4980e0 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
 2006-04-26 12:45:29 +04:00
aivanov@mysql.com
6f8c03ee69 Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
 2006-04-26 12:43:38 +04:00
aivanov@mysql.com
b34ec32b5b Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
 2006-04-26 11:23:43 +04:00
aivanov@mysql.com
11687d2f84 Make innodb_mysql produce a non-empty output. 2006-04-26 11:15:09 +04:00
aivanov@mysql.com
b748835897 Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
 2006-04-26 09:56:06 +04:00
aivanov@mysql.com
7b8c526078 Files innodb.[test|result] are to be used by Innobase only. 
Use files innodb_mysql.[test|result] instead.
 2006-04-26 09:51:57 +04:00
sergefp@mysql.com
867dffa8a4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug15827-r2
 2006-04-26 00:30:54 +04:00
sergefp@mysql.com
1d4acfb668 BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )", as that consumes 
too much memory. Instead, either create the equvalent SEL_TREE manually, or create only two ranges that
strictly include the area to scan
(Note: just to re-iterate: increasing NOT_IN_IGNORE_THRESHOLD will make optimization run slower for big 
IN-lists, but the server will not run out of memory. O(N^2) memory use has been eliminated)
 2006-04-25 23:33:31 +04:00
knielsen@mysql.com
854cbe88b6 Merge mysql.com:/usr/local/mysql/mysql-4.1 
into  mysql.com:/usr/local/mysql/mysql-5.0-mtr-fix
 2006-04-24 23:51:47 +02:00
knielsen@mysql.com
17a80c9da4 Fix typo in mysql-test-run.pl (not caught by aotupush since it uses mysql-test-run.sh). 2006-04-24 15:34:01 +02:00
knielsen@mysql.com
afeb3c06f7 Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-4.1-mtr-fix 
into  mysql.com:/data0/knielsen/mysql-4.1-mtr-fix
 2006-04-24 10:28:31 +02:00
ramil@production.mysql.com
f7394c26f5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  production.mysql.com:/usersnfs/rkalimullin/4.1.b17896
 2006-04-24 08:01:10 +02:00
aelkin@mysql.com
a8368fde52 Merge mysql.com:/net/nb/home/elkin/MySQL/FIXES/5.0-bug17263-temp_drop 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-04-23 20:06:30 +03:00
aelkin@mysql.com
b56d36dd30 Bug#17263 temporary tables and replication 
The fix refines the algorithm of generating DROPs for binlog. 
Temp tables with common pseudo_thread_id are clustered into one query. 
Consequently one replication event per pseudo_thread_id is generated.
 2006-04-23 19:59:43 +03:00
aelkin@mysql.com
28fe756a3d manual merge use local 2006-04-23 12:32:41 +03:00
aelkin@mysql.com
b2b725dba0 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-04-23 12:32:40 +03:00
aelkin@mysql.com
c5219d0d67 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-04-23 12:32:39 +03:00
konstantin@mysql.com
8301e6f625 Merge mysql.com:/opt/local/work/mysql-5.0-root 
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
 2006-04-23 13:32:38 +04:00
aivanov@mysql.com
4fba67933d Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0
 2006-04-23 13:32:37 +04:00
aelkin@mysql.com
a4ff312037 Bug#17263 temporary tables and replication 
Backporting a changeset made for 5.0. Comments from there:

  The fix refines the algorithm of generating DROPs for binlog.
  Temp tables with common pseudo_thread_id are clustered into one query.
  Consequently one replication event per pseudo_thread_id is generated.
 2006-04-23 12:18:57 +03:00
dlenev@mysql.com
5e7076ce95 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/mysql-5.0-bg15153-2
 2006-04-22 11:56:15 +04:00
dlenev@mysql.com
c77d5a0ed1 Fix for bug#15153 "CONVERT_TZ() is not allowed in all places in VIEWs". 
Error was emitted when one tried to select information from view which used
merge algorithm and which also had CONVERT_TZ() function in its select list.

This bug was caused by wrong assumption that global table list for view
which is handled using merge algorithm begins from tables belonging to
the main select of this view. Nowadays the above assumption is not true only
when one uses convert_tz() function in view's select list, but in future
other cases may be added (for example we may support merging of views
with subqueries in select list one day). Relying on this false assumption
led to the usage of wrong table list for field lookups and therefor errors. 

With this fix we explicitly use pointer to the beginning of main select's
table list.
 2006-04-22 11:54:25 +04:00
kent@mysql.com
806564d754 innodb_unsafe_binlog-master.opt: 
Make InnoDB option "loose", as the server might be
  started with this option just to find out the test
  is to be skipped in the configuration (bug#17359)
 2006-04-21 20:24:52 +02:00
igor@rurik.mysql.com
4b21910b0d Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2006-04-21 09:46:47 -07:00
igor@rurik.mysql.com
510ab81362 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  rurik.mysql.com:/home/igor/mysql-4.1
 2006-04-21 08:22:03 -07:00
igor@rurik.mysql.com
639e875032 Post merge fixes 2006-04-21 08:19:38 -07:00
kroki@mysql.com
b0c1e49a11 Bug#15728: LAST_INSERT_ID function inside a stored function returns 0 
Do not reset value of LAST_INSERT_ID() in sub-statement.
 2006-04-21 18:55:04 +04:00
tomas@poseidon.ndb.mysql.com
77e3fc3a09 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-04-21 14:02:21 +02:00
ramil@production.mysql.com
aed861fd86 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  production.mysql.com:/usersnfs/rkalimullin/4.1.b18643
 2006-04-21 13:56:40 +02:00
tomas@poseidon.ndb.mysql.com
f071779791 Bug #17230 Can't change character-sets-dir for ndbd 2006-04-21 13:53:48 +02:00
pem@mysql.com
8c5ae25ff5 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug18344/mysql-5.0-runtime
 2006-04-21 10:22:06 +02:00
msvensson@neptunus.(none)
e984716c01 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/my50-bug19190
 2006-04-21 10:17:16 +02:00
igor@rurik.mysql.com
37ac782206 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-21 00:36:20 -07:00
igor@rurik.mysql.com
fd3e924164 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2006-04-20 22:34:37 -07:00
igor@rurik.mysql.com
fc7514151f Fixed bug #18767. 
The bug caused wrong result sets for union constructs of the form
(SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2.
For such queries order lists were concatenated and limit clause was
completely neglected.
 2006-04-20 22:15:38 -07:00
aivanov@mysql.com
364621abc0 Restoring changes erroneously removed by applying 
the innodb-5.0-ss476 snapshot.
 2006-04-21 01:37:31 +04:00
aivanov@mysql.com
25d9a75d12 Applied innodb-5.0-ss476 snapshot. 
Fix BUG#18934: "InnoDB crashes when table uses column like DB_ROW_ID".
 Also, fix memory leaks in row_create_table_for_mysql() in rare
 corner cases.
 2006-04-21 01:07:37 +04:00
mleich@mysql.com
4cbad914ca Post merge correction for the Changesset 
Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to MySQL 4.1
and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
 2006-04-20 19:43:02 +02:00
pem@mysql.com
2dc3026c08 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug18949/mysql-5.0-runtime
 2006-04-20 16:00:33 +02:00
mleich@mysql.com
26b9d40309 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src 
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
 2006-04-20 15:25:28 +02:00
mskold@mysql.com
fdd6d3ca8c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2006-04-20 13:35:34 +02:00
mleich@mysql.com
e8178cabb1 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src 
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
 2006-04-20 12:35:10 +02:00
mskold@mysql.com
22d345bf5b Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code 2006-04-20 12:06:22 +02:00
evgen@moonbone.local
e347ec5cbe func_gconcat.result, func_gconcat.test: 
Remove duplicate test case for bug#14169
 2006-04-20 13:34:14 +04:00
mleich@production.mysql.com
5109b3ce02 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  production.mysql.com:/usersnfs/mleich/src
 2006-04-20 11:31:22 +02:00
evgen@moonbone.local
4b04ce8085 func_gconcat.test: 
Clean up test case for bug#14169
 2006-04-20 12:35:33 +04:00