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

32545 commits

This branch
This branch
All branches
Author SHA1 Message Date
cmiller@zippy.cornsilk.net
7c3b9384e9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug19356/my50-bug19356
 2006-10-04 12:32:42 -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
5384a83d12 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my50-bug19024 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-10-04 11:00:24 -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)
4f46f3bde7 Merge bk-internal:/home/bk/mysql-5.0-runtime 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 14:26:11 +02:00
msvensson@neptunus.(none)
3f8edc3706 Merge bk-internal:/home/bk/mysql-5.0-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 14:24:43 +02:00
msvensson@shellback.(none)
9a8bc01f8c Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 09:05:34 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
40bcedf4e3 Merge mysql.com:/usr/home/bar/mysql-4.1-rpl.b8663 
into  mysql.com:/usr/home/bar/mysql-5.0-rpl
 2006-10-03 12:03:35 +05:00
msvensson@shellback.(none)
b08195785c Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 09:03:28 +02:00
msvensson@shellback.(none)
60f9a9a8aa Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 08:59:00 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
72ad606ece Merge mysql.com:/usr/home/bar/mysql-4.1.b8663 
into  mysql.com:/usr/home/bar/mysql-4.1-rpl
 2006-10-03 11:53:01 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
f2a3f1a679 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22271/my50-bug22271
 2006-10-03 09:00:03 +05:00
msvensson@shellback.(none)
5126dcc878 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 01:04:18 +02:00
msvensson@shellback.(none)
3bed246481 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 01:01:06 +02:00
msvensson@shellback.(none)
3f8686514f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-10-03 00:58:13 +02:00
msvensson@shellback.(none)
600586c680 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 00:51:23 +02:00
msvensson@shellback.(none)
b975b4a793 Add ATTRIBUTE_FORMAT_FPTR macro for setting format specifier also on function pointers 
This was available from gcc 3.1, so diable it before that
Update m_ctype.h to use the new macro
 2006-10-03 00:48:26 +02:00
tsmith/tim@siva.hindu.god
1d5d5a1c4a Merge siva.hindu.god:/usr/home/tim/m/bk/40 
into  siva.hindu.god:/usr/home/tim/m/bk/41
 2006-10-02 16:18:42 -06:00
tsmith/tim@siva.hindu.god
65dd6e0c1e Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  siva.hindu.god:/usr/home/tim/m/bk/41
 2006-10-02 16:16:24 -06:00
tsmith/tim@siva.hindu.god
3e20a10899 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  siva.hindu.god:/usr/home/tim/m/bk/40
 2006-10-02 16:13:58 -06:00
tsmith/tim@siva.hindu.god
ae24bc21de Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/wl3516/50
 2006-10-02 13:29:55 -06:00
dlenev@mockturtle.local
8eb4401c59 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
 2006-10-02 22:53:10 +04:00
msvensson@neptunus.(none)
14186cbdca Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-02 18:46:41 +02:00
kroki/tomash@moonlight.intranet
f732270e5b Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21081
 2006-10-02 18:01:04 +04:00
bteam/mysqldev@mysql.com/production.mysql.com
d74621142b Raise version number 2006-10-02 15:15:16 +02:00
kroki/tomash@moonlight.intranet
8f3f277642 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726
 2006-10-02 17:00:39 +04: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
msvensson@neptunus.(none)
d5ad8ff4a2 Remove faulty merge 2006-10-02 14:05:36 +02:00
msvensson@neptunus.(none)
cb0a874c11 When compiling with qcc on QNC the define __GNUC__will be set although it doesn't support full GNU syntax 
- disable __attribute__ when using qcc
 2006-10-02 13:53:10 +02:00
msvensson@neptunus.(none)
c3a1980e16 Remove faulty merge causing ctype_utf8 failure 2006-10-02 13:47:18 +02:00
msvensson@neptunus.(none)
1517d37048 Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol) 2006-10-02 13:46:40 +02:00
msvensson@neptunus.(none)
1dc026f79d Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-02 13:36:30 +02:00
msvensson@neptunus.(none)
b277139b0c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-02 13:18:54 +02: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@mysql.com/april.(none)
25ef3a6ee1 Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2006-10-02 14:53:03 +05:00
svoj@mysql.com/april.(none)
361c46eefe Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2006-10-02 14:52:09 +05:00
svoj@mysql.com/april.(none)
5f3cf1eca3 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
 2006-10-02 14:46:10 +05:00
svoj@mysql.com/april.(none)
7afbe5f86e Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
 2006-10-02 14:42:12 +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)
c3820867ce Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-02 10:11:18 +02:00
tsmith/tim@siva.hindu.god
5ffa3e1bff Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol) 2006-09-30 02:00:04 -06:00
dlenev@mockturtle.local
79bf51461e Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg20670-2
 2006-09-30 11:35:34 +04:00
jimw@rama.(none)
f3ead515fb Merge bk-internal:/home/bk/mysql-5.0-maint 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-09-29 19:32:05 -07:00
jimw@rama.(none)
34531d261b Merge bk-internal:/home/bk/mysql-4.1-maint 
into  rama.(none):/home/jimw/my/mysql-4.1-clean
 2006-09-29 19:29:12 -07:00
jimw@rama.(none)
0296227343 Merge rama.(none):/home/jimw/my/mysql-4.1-clean 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-09-29 19:28:44 -07:00
jimw@rama.(none)
52d22ad827 Disable __attribute__ entirely on g++ < 3.4. (Bug #2717) 2006-09-29 19:28:16 -07:00
jimw@rama.(none)
5963b5af0f Merge bk-internal:/home/bk/mysql-4.1-maint 
into  rama.(none):/home/jimw/my/mysql-4.1-clean
 2006-09-29 19:26:33 -07:00
cmiller@zippy.cornsilk.net
cca474bb67 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-09-29 17:23:44 -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
tsmith/tim@siva.hindu.god
b7d0ec2422 WL #3516: MySQL Enterprise: implement Version Display Specification 
Print version_comment after server version in:
mysql.cc:  Welcome message and 'status' command output
log.cc: Top of log files
 2006-09-29 12:52:48 -06:00