mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38663 commits 2788 branches 343 tags 1.7 GiB
Commit graph

38663 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
4b51032fa5 Merge bk-internal:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-03 20:22:28 +02: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
kroki/tomash@moonlight.intranet
62c79bee51 After merge fix. 2006-10-03 17:07:30 +04:00
kroki/tomash@moonlight.intranet
5f6244c82d Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726
 2006-10-03 16:47:40 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
0cfb76b802 sql_yacc.yy: 
After merge fix.
field.cc:
  After merge fix
 2006-10-03 17:05:33 +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
8798b462b5 Fix for the patch for bug#21726: Incorrect result with multiple 
invocations of LAST_INSERT_ID.

Reding of LAST_INSERT_ID inside stored function wasn't noted by caller,
and no LAST_INSERT_ID_EVENT was issued for binary log.

The solution is to add THD::last_insert_id_used_bin_log, which is much
like THD::last_insert_id_used, but is reset only for upper-level
statements.  This new variable is used to issue LAST_INSERT_ID_EVENT.
 2006-10-03 13:38:16 +04: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
msvensson@neptunus.(none)
7f21400c52 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-03 09:22:49 +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
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
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
msvensson@neptunus.(none)
3da45a6da9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-02 23:08:30 +02:00
tsmith/tim@siva.hindu.god
4c6dc3c461 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  siva.hindu.god:/usr/home/tim/m/bk/wl3516/51
 2006-10-02 13:42:30 -06: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
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
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
msvensson@neptunus.(none)
d5ad8ff4a2 Remove faulty merge 2006-10-02 14:05:36 +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
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
mats@romeo.(none)
3aaa49ed0b BUG#22550 (Replication of BIT column failing): 
Adding test case.
 2006-10-02 13:38:06 +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
kroki/tomash@moonlight.intranet
b6f56ed67a Fix after manual merge: add tests from 5.0. 2006-10-02 15:26:01 +04: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
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)
9ace1cc45d Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-10-02 15:12:11 +05: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
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)
a5c4d2c5ec Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-02 11:10:22 +02: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)
a42a6aaffd Merge bk-internal:/home/bk/mysql-5.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-02 10:14:27 +02: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
msvensson@neptunus.(none)
6ebcb3d701 Don't run crash_commit_before under valgrind 2006-10-02 10:07:46 +02:00