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
51038 commits 2781 branches 343 tags 1.6 GiB
Commit graph

51038 commits

This branch
This branch
All branches
Author SHA1 Message Date
kaa@polly.(none)
4d6b50f6d5 Merge polly.(none):/home/kaa/src/opt/bug9481/my50-bug9481 
into  polly.(none):/home/kaa/src/opt/bug9481/my51-bug9481
 2007-11-30 18:27:00 +03:00
kaa@polly.(none)
24c9d86416 5.0 version of the fix for bug #9481: mysql_insert_id() returns 0 after 
insert ... select.

The 5.0 manual page for mysql_insert_id() does not mention anything
about INSERT ... SELECT, though its current behavior is incosistent
with what the manual says about the plain INSERT.

Fixed by changing the AUTO_INCREMENT and mysql_insert_id() handling
logic in INSERT ... SELECT to be consistent with the INSERT behavior,
the manual, and the changes in 5.1 introduced by WL3146:


- mysql_insert_id() now returns the first automatically generated
AUTO_INCREMENT value that was successfully inserted by INSERT ... SELECT

-  if an INSERT ... SELECT statement is executed, and no automatically
generated value is successfully inserted, mysql_insert_id() now returns
the ID of the last inserted row.
 2007-11-26 18:36:05 +03:00
kaa@polly.(none)
4051d1cda2 Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-11-19 16:19:49 +03:00
kaa@polly.(none)
4cbcdb9b88 Merge polly.(none):/home/kaa/src/opt/bug32376/my51-bug26215 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-11-19 16:16:44 +03:00
kaa@polly.(none)
ee1bb66368 Merge polly.(none):/home/kaa/src/opt/bug32376/my50-bug26215 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-11-19 16:14:05 +03:00
kaa@polly.(none)
74bc350bcc Merge polly.(none):/home/kaa/src/opt/bug32376/my50-bug26215 
into  polly.(none):/home/kaa/src/opt/bug32376/my51-bug26215
 2007-11-19 15:57:50 +03:00
kaa@polly.(none)
b93bbc5ea6 Changed the help text for --comments to make it clear which option 
disables the option explicitely.
Changed the option location in code so that --help will show it in
lexical option order.

This is for bug #26215: mysql command line client should not strip
comments from SQL statements
 2007-11-19 15:27:44 +03:00
gluh@mysql.com/eagle.(none)
be3070ef93 Bug#32158 Crash in open_table_from_share, on mysql_unpack_partition errors 
added check for the result of mysql_unpack_partition()
 2007-11-19 12:42:25 +04:00
gshchepa/uchum@gleb.loc
7a47199880 Merge gleb.loc:/work/bk/PA/5.0-opt-32335 
into  gleb.loc:/work/bk/5.1-opt
 2007-11-18 16:54:47 +04:00
gshchepa/uchum@gleb.loc
6f7755f058 Merge gleb.loc:/work/bk/5.0-opt-32335 
into  gleb.loc:/work/bk/5.0-opt
 2007-11-18 00:08:41 +04:00
gshchepa/uchum@gleb.loc
f93b5a9c41 Fixed bug #32335. 
Comparison of a BIGINT NOT NULL column with a constant arithmetic
expression that evaluates to NULL caused error 1048: "Column '...'
cannot be null".

Made convert_constant_item() check if the constant expression is NULL
before attempting to store it in a field. Attempts to store NULL in a
NOT NULL field caused query errors.
 2007-11-18 00:02:55 +04:00
holyfoot/hf@hfmain.(none)
e62c733bd6 Merge mysql.com:/home/hf/work/31158/my50-31158 
into  mysql.com:/home/hf/work/31158/my51-31158
 2007-11-17 20:28:10 +04:00
holyfoot/hf@hfmain.(none)
796d2dab6e Merge mysql.com:/home/hf/work/31158/my41-31158 
into  mysql.com:/home/hf/work/31158/my50-31158
 2007-11-17 20:27:13 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
df5b0297fd Merge bk@192.168.21.1:mysql-4.1-opt 
into  mysql.com:/home/hf/work/31158/my41-31158
 2007-11-17 20:24:22 +04:00
holyfoot/hf@hfmain.(none)
80e39eb44e Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/31158/my50-31158
 2007-11-17 20:23:15 +04:00
holyfoot/hf@hfmain.(none)
0a570643eb Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/31158/my51-31158
 2007-11-17 17:16:32 +04:00
holyfoot/hf@hfmain.(none)
e400b54447 Merge mysql.com:/home/hf/work/31158/my50-31158 
into  mysql.com:/home/hf/work/31158/my51-31158
 2007-11-17 17:12:18 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
67ce52fd66 merging 2007-11-17 17:11:05 +04:00
holyfoot/hf@hfmain.(none)
7588fa52b6 Merge mysql.com:/home/hf/work/31158/my41-31158 
into  mysql.com:/home/hf/work/31158/my50-31158
 2007-11-17 16:48:57 +04:00
kaa@polly.(none)
a91bb550ae Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-11-16 14:33:21 +03:00
kaa@polly.(none)
6733c292a8 Merge polly.(none):/home/kaa/src/opt/bug32241/my51-bug29131 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-11-16 14:30:25 +03:00
kaa@polly.(none)
7b38492a4c Merge polly.(none):/home/kaa/src/opt/bug32241/my50-bug29131 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-11-16 14:24:06 +03:00
kaa@polly.(none)
d9e48751d1 Merge polly.(none):/home/kaa/src/opt/bug32241/my50-bug29131 
into  polly.(none):/home/kaa/src/opt/bug32241/my51-bug29131
 2007-11-16 14:00:57 +03:00
kaa@polly.(none)
82125f281f Fix for bug #32241: memory corruption due to large index map in 'Range 
checked for each record'

The problem was in incorrectly calculated length of the buffer used to
store a hexadecimal representation of an index map in
select_describe(). This could result in buffer overrun and stack
corruption under some circumstances.

Fixed by correcting the calculation.
 2007-11-16 13:58:09 +03:00
gluh@eagle.(none)
32f92b8f1b Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-11-16 14:54:35 +04:00
gluh@eagle.(none)
b12f4cbb73 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-11-16 14:53:54 +04:00
gluh@eagle.(none)
4471e7e0e4 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-11-16 14:49:59 +04:00
gluh@mysql.com/eagle.(none)
f4c2eff997 Bug#30294 blackhole engine causes 100% with 2 alter table statements running 
Implement neccessary shared lock structure for table locks.
This is the backport of bug26241 fix.
 2007-11-16 14:46:36 +04:00
gkodinov/kgeorge@magare.gmz
f7876a2cfc Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31928-5.1-opt
 2007-11-15 17:32:25 +02:00
gkodinov/kgeorge@magare.gmz
85fab707c5 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31928-5.0-opt
 2007-11-15 17:30:08 +02:00
gkodinov/kgeorge@magare.gmz
092e7803c9 merge of bug 31928 to 5.1-opt 2007-11-15 14:12:59 +02:00
tnurnberg@white.intern.koehntopp.de
074a1dbd02 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/31700/51-31700
 2007-11-15 12:31:40 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
f1adcf9d75 Bug#31700: thd->examined_row_count not incremented for 'const' type queries 
tests adjusted for Windows
 2007-11-15 12:30:35 +01:00
gkodinov/kgeorge@magare.gmz
9c06883a42 Merge magare.gmz:/home/kgeorge/mysql/work/B31928-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B31928-5.1-opt
 2007-11-15 12:00:08 +02:00
gluh@mysql.com/eagle.(none)
3b38836e6d updated result file 2007-11-15 11:58:42 +04:00
gluh@mysql.com/eagle.(none)
f3600c9437 updated result file 2007-11-14 20:40:07 +04:00
gluh@eagle.(none)
6fefa58d90 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-11-14 18:56:49 +04:00
gluh@mysql.com/eagle.(none)
b56f668ca3 after merge fix 2007-11-14 18:56:14 +04:00
gluh@eagle.(none)
602e972905 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-11-14 17:31:17 +04:00
gluh@eagle.(none)
58336411c9 Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-11-14 17:30:16 +04:00
gluh@eagle.(none)
294c872fa5 Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-11-14 17:26:59 +04:00
gluh@eagle.(none)
246c6c35a9 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-11-14 17:26:22 +04:00
gluh@mysql.com/eagle.(none)
ea3bfdb26d Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
 2007-11-14 17:22:03 +04:00
gshchepa/uchum@gleb.loc
95e7cccfee Merge gleb.loc:/home/uchum/work/bk/5.1-opt-32034 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-11-14 15:49:57 +04:00
gkodinov/kgeorge@magare.gmz
82ce901ded Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31562-5.1-opt
 2007-11-14 12:03:28 +02:00
gshchepa/uchum@gleb.loc
70f36562bc Fixed bug #32034: On 64bit platforms assigning values of 
storage engine system variables was not validated and
unexpected value was assigned.

The check_func_enum function used subtraction from the uint
value with the probably negative result. That result of
type uint was compared with 0 after casting to signed long
type. On architectures where long type is longer than int
type the result of comparison was unexpected.
 2007-11-14 13:48:21 +04:00
holyfoot/hf@hfmain.(none)
19c3bd89f8 Merge mysql.com:/home/hf/work/32067/my51-32067 
into  mysql.com:/home/hf/work/31305/my51-31305
 2007-11-13 23:16:48 +04:00
holyfoot/hf@hfmain.(none)
fbac43bbba Merge mysql.com:/home/hf/work/31305/my41-31305 
into  mysql.com:/home/hf/work/31305/my50-31305
 2007-11-13 23:15:03 +04:00
holyfoot/hf@hfmain.(none)
acd198d5fa Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/31305/my50-31305
 2007-11-13 23:13:59 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
0c15068ff8 Merge bk@192.168.21.1:mysql-4.1-opt 
into  mysql.com:/home/hf/work/31305/my41-31305
 2007-11-13 23:12:55 +04:00