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

14250 commits

Author SHA1 Message Date
ramil/ram@myoffice.izhnet.ru
5060fa10f8 Merge mysql.com:/usr/home/ram/work/bug22029/my50-bug22029 
into  mysql.com:/usr/home/ram/work/bug22029/my51-bug22029
 2006-11-22 09:29:22 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0a415e360c Merge mysql.com:/usr/home/ram/work/bug22029/my41-bug22029 
into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
 2006-11-22 09:19:51 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
5df9ec9a59 Fix for bug #22029: str_to_date returning NULL, while date_format works using identical format. 
The problem appears when we have a space followed by a non-format symbol.

Fix: properly skip spaces.
 2006-10-05 15:29:00 +05:00
cmiller@zippy.cornsilk.net
b69606a5e9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug19356/my51-bug19356
 2006-10-04 12:25:00 -04:00
cmiller@zippy.cornsilk.net
924e56c92d Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug19356/my50-bug19356 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug19356/my51-bug19356
 2006-10-04 11:29:16 -04:00
cmiller@zippy.cornsilk.net
66659796ff Bug#19356: Assert on undefined @uservar in prepared statement execute 
The executing code had a safety assertion so that it refused to free Items
that it didn't create.  However, there is a case, undefined user variables,
which would put Items into the list to be freed.

Instead, do something that is more risky in expectation that the code will 
be refactored soon, as Kostja wants to do:  Remove the assertions from 
prepare() and execute().  Put one assertion at a higher level, before 
stmt->set_params_from_vars(), which may then create new to-be-freed Items .
 2006-10-04 11:19:23 -04:00
iggy@rolltop.ignatz42.dyndns.org
003d55a788 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my51-bug19024 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-10-04 10:59:02 -04:00
iggy@rolltop.ignatz42.dyndns.org
d74a6e1dc1 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my50-bug19024 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my51-bug19024
 2006-10-04 10:56:04 -04:00
iggy@rolltop.ignatz42.dyndns.org
d96be311cb Bug #19024- SHOW COUNT(*) WARNINGS not return Errors 
The server variable warning_count should include the number of warnings, errors and notes according to the manual
 2006-10-04 10:49:39 -04:00
msvensson@neptunus.(none)
237779218c Merge bk-internal:/home/bk/mysql-5.1-new-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-03 15:56:56 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
9c53c7ffb1 Automerge fix: "Out of range value" error message adjusted to 5.1. 2006-10-03 18:48:50 +05:00
msvensson@neptunus.(none)
48d99634f3 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-03 13:27:48 +02:00
bar@bar.intranet.mysql.r18.ru
3cfbe36adc After merge fix 2006-10-03 16:00:09 +05:00
kroki/tomash@moonlight.intranet
3910542096 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726
 2006-10-03 12:43:14 +04:00
msvensson@neptunus.(none)
ca21b57992 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-03 09:28:44 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
5b491de247 after-merge fix: warning adjusted. 2006-10-03 11:05:25 +05:00
ramil/ram@myoffice.izhnet.ru
b1463a4b42 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug22271/my51-bug22271
 2006-10-03 08:56:19 +05:00
ramil/ram@myoffice.izhnet.ru
9241230b69 Merge mysql.com:/usr/home/ram/work/bug22271/my50-bug22271 
into  mysql.com:/usr/home/ram/work/bug22271/my51-bug22271
 2006-10-03 08:51:59 +05:00
dlenev@mockturtle.local
cc9ab7d0b7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-10-02 23:40:56 +04:00
kroki/tomash@moonlight.intranet
b9173c1023 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726
 2006-10-02 23:17:40 +04:00
dlenev@mockturtle.local
0868629129 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-10-02 21:41:35 +04:00
kroki/tomash@moonlight.intranet
9402038287 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21081
 2006-10-02 18:01:32 +04:00
lars/lthalmann@dl145j.mysql.com
9b17d0d332 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
 2006-10-02 15:33:15 +02:00
lars/lthalmann@dl145h.mysql.com
4f2b786bf3 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-10-02 14:21:49 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
a8e845a6d2 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-10-02 14:19:51 +02:00
mats@romeo.(none)
c8ec10e4a4 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/fix-mysql-5.1-new-rpl
 2006-10-02 14:03:54 +02:00
mats@romeo.(none)
3aaa49ed0b BUG#22550 (Replication of BIT column failing): 
Adding test case.
 2006-10-02 13:38:06 +02:00
kroki/tomash@moonlight.intranet
b6f56ed67a Fix after manual merge: add tests from 5.0. 2006-10-02 15:26:01 +04:00
kroki/tomash@moonlight.intranet
8aa33bf46d Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726
 2006-10-02 15:01:19 +04:00
kroki/tomash@moonlight.intranet
5ea8adfae7 BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID 
Non-upper-level INSERTs (the ones in the body of stored procedure,
stored function, or trigger) into a table that have AUTO_INCREMENT
column didn't affected the result of LAST_INSERT_ID() on this level.

The problem was introduced with the fix of bug 6880, which in turn was
introduced with the fix of bug 3117, where current insert_id value was
remembered on the first call to LAST_INSERT_ID() (bug 3117) and was
returned from that function until it was reset before the next
_upper-level_ statement (bug 6880).

The fix for bug#21726 brings back the behaviour of version 4.0, and
implements the following: remember insert_id value at the beginning
of the statement or expression (which at that point equals to
the first insert_id value generated by the previous statement), and
return that remembered value from LAST_INSERT_ID() or @@LAST_INSERT_ID.

Thus, the value returned by LAST_INSERT_ID() is not affected by values
generated by current statement, nor by LAST_INSERT_ID(expr) calls in
this statement.

Version 5.1 does not have this bug (it was fixed by WL 3146).
 2006-10-02 14:28:23 +04:00
svoj@april.(none)
115c4fe8dc Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-10-02 15:11:08 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
e585a7d189 bug#6147 - fixing ndb test results (forgot to include into the main commit) 2006-10-02 14:17:41 +05:00
msvensson@neptunus.(none)
c5ddd64bb8 Merge neptunus.(none):/home/msvensson/mysql/work/my51-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-02 10:27:38 +02:00
msvensson@neptunus.(none)
6ebcb3d701 Don't run crash_commit_before under valgrind 2006-10-02 10:07:46 +02:00
baker@bk-internal.mysql.com
8a5fef1419 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-10-01 22:31:04 +02:00
brian@zim.(none)
8096f1c4b2 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-30 19:12:50 -07:00
brian@zim.(none)
4117860ec6 Merge zim.(none):/home/brian/mysql/merge-5.1 
into  zim.(none):/home/brian/mysql/arch-5.1
 2006-09-30 18:44:42 -07:00
brian@zim.(none)
56505c01f9 This patch updates to remove most global hton needs. Cleans up wrong message in partition. 2006-09-30 18:31:13 -07:00
tsmith/tim@siva.hindu.god
c36f165629 Post-merge fix. New error ER_NON_INSERTABLE_TABLE put at end of errmsg.txt, means that the error number in 5.1 is 1573, while in 5.0 it is 1471. 2006-09-30 01:21:27 -06:00
tsmith/tim@siva.hindu.god
44f0e55ca4 Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51
 2006-09-29 18:04:34 -06:00
dlenev@mockturtle.local
93fed182eb Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20670
 2006-09-30 00:31:33 +04:00
cmiller@zippy.cornsilk.net
5275e2437a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-29 16:24:21 -04:00
kroki/tomash@moonlight.intranet
5c9420bb18 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21081
 2006-09-29 22:33:08 +04:00
dlenev@mockturtle.local
8b63a55b3a After merge fixes. 2006-09-29 21:05:12 +04:00
sergefp@mysql.com
cd094b71af BUG#14940: Update test results 2006-09-29 20:42:37 +04:00
dlenev@mockturtle.local
5c2a51292d Merge mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-09-29 19:39:15 +04:00
cmiller@zippy.cornsilk.net
fa438d86cc Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my51-bug20778 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-29 11:20:47 -04:00
cmiller@zippy.cornsilk.net
097d60a883 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-29 11:18:26 -04:00
cmiller@zippy.cornsilk.net
2a7d7dd939 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my51-bug20778
 2006-09-29 11:14:28 -04:00
sergefp@pylon.mylan
16506e906b Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/psergey/mysql-5.1-bug14940-r10a
 2006-09-29 18:35:03 +04:00