mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
43886 commits 2780 branches 343 tags 1.6 GiB
Commit graph

43886 commits

This branch
This branch
All branches
Author SHA1 Message Date
bar@mysql.com/bar.myoffice.izhnet.ru
8bc4ded6aa Bug#26518 XPath and variables problem 
Problem: XPath variables didn't work.
Fix: adding variables support,
both user-defined and sp local variables are now supported by XPath.
 2007-05-08 13:32:29 +05:00
guilhem@gbichot3.local
68cc7dde31 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-26194
 2007-03-22 17:32:37 +01:00
guilhem@gbichot3.local
21492b54b4 Fix for BUG#26194 "mysqlbinlog --base64-output produces invalid SQL"; 
when it was printing a Query event, it produced invalid SQL (missing
the BINLOG keyword, so the SQL started with the base64 string, which
is incorrect).
Note: no testcase; I have a .test which shows that the bugfix works,
but it triggers BUG#26361 and so gives Valgrind warnings. I'm sending
this test to the fixer of BUG#26361 for her/him to push when she/he
fixes BUG#26361.
 2007-03-22 17:31:39 +01:00
mats@romeo.(none)
070c147bca Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b23171-mysql-5.1-new-rpl
 2007-03-22 17:23:12 +01:00
mats@romeo.(none)
82f3f318c6 BUG#23171: Illegal group log position 
Post-merge fixes.
 2007-03-22 16:59:55 +01:00
guilhem@gbichot3.local
6a4dbc3322 Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl 
into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-26194
will fix by hand
 2007-03-22 16:00:47 +01:00
guilhem@gbichot3.local
f0a95a4e20 - renaming TMP_TABLE to NON_TRANSACTIONAL_TMP_TABLE because this is 
what it actually means (Monty approved the renaming)
- correcting description of transaction_alloc command-line options
(our manual is correct)
- fix for a failure of rpl_trigger.
 2007-03-22 15:07:32 +01:00
mats@romeo.(none)
68ebc7e495 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b23171-mysql-5.1-new-rpl
 2007-03-22 09:05:11 +01:00
mats@romeo.(none)
2ee007ba9d BUG#23171: Illegal group log position 
Tail fixes after re-applying patches to older version of clone.
 2007-03-22 08:32:41 +01:00
cbell/Chuck@mysql_cab_desk.
f0936e9441 Merge mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_25543 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_25543
 2007-03-21 10:56:43 -04:00
cbell/Chuck@mysql_cab_desk.
825ad05e5f Merge mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_25543
 2007-03-19 16:12:46 -04:00
evgen@moonbone.local
11d37efa5e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
 2007-03-11 00:26:45 +03:00
evgen@moonbone.local
f3e56b5adb Merge moonbone.local:/mnt/gentoo64/work/15757-bug-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
 2007-03-10 19:57:18 +03:00
evgen@moonbone.local
6f6b9ae3ad Bug#15757: Wrong SUBSTRING() result when a tmp table was employed. 
When the SUBSTRING() function was used over a LONGTEXT field the max_length of
the SUBSTRING() result was wrongly calculated and set to 0. As the max_length
parameter is used while tmp field creation it limits the length of the result
field and leads to printing an empty string instead of the correct result.

Now the Item_func_substr::fix_length_and_dec() function correctly calculates
the max_length parameter.
 2007-03-10 19:55:34 +03:00
evgen@moonbone.local
e7a309197b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
 2007-03-10 19:53:59 +03:00
igor@olga.mysql.com
ec4593f59a Fixed bug #26830: a crash for the query with a subselect containing ROLLUP. 
Crash happened because the function get_best_group_min_max detected
joins with ROLLUP incorrectly.
 2007-03-10 02:47:47 -08:00
evgen@moonbone.local
04f5c46d5d Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized 
away.

Additional fix for bug#22331. Now Item_field prints its value in the case of
the const field.
 2007-03-10 00:29:02 +03:00
cbell/Chuck@mysql_cab_desk.
d44eb9f0c9 Bug #25543 Replication of wrong values if using rand() in stored procedure 
When rand() is called multiple times inside a stored procedure, the server does 
not binlog the correct random seed values.

This patch corrects the problem by resetting rand_used= 0 in 
THD::cleanup_after_query() allowing the system to save the random seeds if needed
for each command in a stored procedure body.

However, rand_used is not reset if executing in a stored function or trigger 
because these operations are binlogged by call and thus only the calling statement
need detect the call to rand() made by its substatements. These substatements must 
not set rand_used to 0 because it would remove the detection of rand() by the 
calling statement.
 2007-03-09 12:18:28 -05:00
holyfoot/hf@hfmain.(none)
eca8b1a62d Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-09 16:51:32 +04:00
gkodinov/kgeorge@magare.gmz
9625f2e902 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt
 2007-03-09 14:48:19 +02:00
holyfoot/hf@hfmain.(none)
71e6d69647 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-09 16:37:36 +04:00
gkodinov/kgeorge@magare.gmz
86cba48b8f Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt
 2007-03-09 13:05:41 +02:00
gkodinov/kgeorge@magare.gmz
740a5fd7fe Bug #26281: 
Fixed boundry checks in the INSERT() function:
 were one off.
 2007-03-09 12:47:12 +02:00
igor@olga.mysql.com
e10d74cff9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-03-09 02:45:17 -08:00
igor@olga.mysql.com
6f4da47843 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26661
 2007-03-09 01:50:17 -08:00
holyfoot/hf@hfmain.(none)
bcc5499bab Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-09 13:50:06 +04:00
igor@olga.mysql.com
96cfd5ab91 Fixed bug #26661: crash when order by clause in a union 
construct references invalid name.
Derived tables currently cannot use outer references.
Thus there is no outer context for them.
The 4.1 code takes this fact into account while the 
Item_field::fix_outer_field code of 5.0 lost the check that blocks
any attempts to resolve names in outer context for derived tables.
 2007-03-09 01:45:32 -08:00
holyfoot/hf@mysql.com/hfmain.(none)
2b1179ad07 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
 2007-03-09 13:44:43 +04:00
holyfoot/hf@hfmain.(none)
a9a6347a11 Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-09 13:40:31 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
60e0dceae8 Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
 2007-03-09 13:39:03 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
4ab2b8d782 aftermerge fix 2007-03-09 13:38:40 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
4752db40e8 aftermerge fix 2007-03-09 13:37:06 +04:00
holyfoot/hf@hfmain.(none)
cae7bc8c96 Merge mysql.com:/home/hf/work/mysql-5.1 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-09 12:47:59 +04:00
tsmith@quadxeon.mysql.com
965ca42544 rpl_ssl.result, rpl_ssl.test: 
Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format
 2007-03-08 19:57:35 +01:00
holyfoot/hf@hfmain.(none)
cdcf3ec097 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-08 22:04:17 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
11dd0fa326 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
 2007-03-08 21:42:41 +04:00
tsmith@bk-internal.mysql.com
8539d9a7bd The most recent push into mysql-5.1 from mysql-5.2 was a mistake. 
This just reverses those changes.  I'm really sorry about that.

configure.in, version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)
 2007-03-08 18:38:17 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
618ccf376f Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/home/hf/work/mrg/mysql-4.1-opt
 2007-03-08 21:14:31 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
48d3e2c1bb merging 2007-03-08 20:57:12 +04:00
tsmith@bk-internal.mysql.com
bb273143fc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2
 2007-03-08 17:55:20 +01:00
evgen@moonbone.local
35e5925673 sql_select.cc: 
Postfix for bug#22331.
 2007-03-08 19:38:21 +03:00
msvensson@pilot.blaudden
4374a47090 Update result for 5.1 2007-03-08 16:47:18 +01:00
holyfoot/hf@hfmain.(none)
75be7cd1ae Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-08 19:08:28 +04:00
msvensson@pilot.blaudden
193c3178bc Merge bk-internal:/home/bk/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-03-08 15:10:24 +01:00
msvensson@pilot.blaudden
dd16b217c7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-08 14:56:08 +01:00
msvensson@pilot.blaudden
433d3e6cf7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-08 14:55:39 +01:00
msvensson@pilot.blaudden
73b5b2aed7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-08 14:48:11 +01:00
msvensson@pilot.blaudden
8a8c69f3fd Fix 6 warnings from win64, where one is a potential bug. 2007-03-08 14:29:29 +01:00
msvensson@pilot.blaudden
2739246719 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-08 13:31:37 +01:00
msvensson@pilot.blaudden
49d862230e Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-08 13:30:04 +01:00