Commit graph

48693 commits

Author SHA1 Message Date
evgen@moonbone.local
08b9103d71 Bug#29898: Item_date_typecast::val_int doesn't reset the null_value flag.
The Item_date_typecast::val_int function doesn't reset null_value flag.
This makes all values that follows the first null value to be treated as nulls
and led to a wrong result.

Now the Item_date_typecast::val_int function correctly sets the null_value flag
for both null and non-null values.
2007-07-20 00:06:35 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
c4b12955b3 mysql_client_test fixed 2007-07-20 00:04:30 +05:00
joerg@trift2.
960e895d1d Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-07-19 20:22:29 +02:00
joerg@trift2.
7c4f905d55 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-07-19 20:16:27 +02:00
joerg@trift2.
f2dee68c3d Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-07-19 20:04:35 +02:00
evgen@moonbone.local
7a2491871d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/29850-bug-5.0-opt-mysql
2007-07-19 21:40:12 +04:00
kostja@bodhi.(none)
4c7d2df910 A follow-up fix for Bug#29431 "killing an insert delayed thread causes
crash" in 5.1
2007-07-19 21:10:19 +04:00
kostja@bodhi.(none)
5e72901c60 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-19 20:27:35 +04:00
evgen@moonbone.local
934089a82b Bug#29850: Wrong charset of GROUP_CONCAT result when the select employs
a temporary table.

The result string of the Item_func_group_concat wasn't initialized in the 
copying constructor of the Item_func_group_concat class. This led to a
wrong charset of GROUP_CONCAT result when the select employs a temporary
table.

The copying constructor of the Item_func_group_concat class now correctly
initializes the charset of the result string.
2007-07-19 20:21:23 +04:00
joerg@trift-lap.none
518992b829 After-merge fix for bug#14151. 2007-07-19 18:05:55 +02:00
holyfoot/hf@hfmain.(none)
db2b40b426 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/hf/work/29687/my51-29687
2007-07-19 21:03:26 +05:00
holyfoot/hf@hfmain.(none)
1657b9e356 Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/home/hf/work/29687/my51-29687
2007-07-19 21:02:11 +05:00
holyfoot/hf@hfmain.(none)
cd70db6656 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/hf/work/29687/my50-29687
2007-07-19 21:01:58 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
d0272fe1d5 test case for memory leak added 2007-07-19 20:59:11 +05:00
holyfoot/hf@hfmain.(none)
02c81671ce Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/29687/my50-29687
2007-07-19 20:59:08 +05:00
holyfoot/hf@hfmain.(none)
a49bc17fe8 Merge mysql.com:/home/hf/work/29687/my50-29687
into  mysql.com:/home/hf/work/29687/my51-29687
2007-07-19 20:58:04 +05:00
kostja@bodhi.(none)
7ca9124d2e A post-merge fix 2007-07-19 19:56:07 +04:00
tsmith@bk-internal.mysql.com
4223b12523 Merge bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.0-maint
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.1-maint
2007-07-19 17:44:35 +02:00
tsmith@bk-internal.mysql.com
b066c1208e Merge bk-internal.mysql.com:/data0/bk/mysql-4.1-maint
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.0-maint
2007-07-19 17:43:34 +02:00
kostja@bodhi.(none)
f4cf4cbd36 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-19 19:42:24 +04:00
kostja@bodhi.(none)
c4bcce64a4 Rename all references to 'Delayed_insert' instances from 'tmp' to 'di'
for consistency.
2007-07-19 19:36:52 +04:00
kostja@bodhi.(none)
1aae30060e A fix for Bug#29431 killing an insert delayed thread causes crash
No test case, since the bug requires a stress case with 30 INSERT DELAYED
threads and 1 killer thread to repeat. The patch is verified
manually.
Review fixes.

The server that is running DELAYED inserts would deadlock itself
or crash under high load if some of the delayed threads were KILLed
in the meanwhile.

The fix is to change internal lock acquisition order of delayed inserts
subsystem and to ensure that
Delayed_insert::table_list::db does not point to volatile memory in some 
cases.
For details, please see a comment for sql_insert.cc.
2007-07-19 19:28:00 +04:00
gshchepa/uchum@gleb.loc
dfd82a6b74 Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-19 20:06:55 +05:00
gshchepa/uchum@gleb.loc
35a2a20160 Merge gleb.loc:/home/uchum/work/bk/5.1
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-19 20:01:13 +05:00
gshchepa/uchum@gleb.loc
d5f2133bc3 Merge gleb.loc:/home/uchum/work/bk/5.0
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-19 19:57:53 +05:00
gshchepa/uchum@gleb.loc
73b2848f4f Fixed bug #29338.
Optimization of queries with DETERMINISTIC functions in the
WHERE clause was not effective: sequential scan was always
used.
Now a SF with the DETERMINISTIC flags is treated as constant
when it's arguments are constants (or a SF doesn't has arguments).
2007-07-19 18:39:01 +05:00
joerg@trift-lap.none
7b703eaa12 Merge trift-lap.none:/MySQL/M50/bug14151-5.0
into  trift-lap.none:/MySQL/M51/bug14151-5.1
2007-07-19 15:11:01 +02:00
joerg@trift-lap.none
af3c675bc1 Avoid the name conflict between the system-provided "md5.h" and the MySQL one
by renaming "include/md5.h" to "include/my_md5.h".

Fixes bug#14151.
2007-07-19 14:14:03 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
4bab858fba field.cc, field.h:
i5 compatibility
2007-07-19 14:12:05 +02:00
svoj@june.mysql.com
39f7a95589 Merge mysql.com:/home/svoj/devel/mysql/BUG26325/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG26325/mysql-5.1-engines
2007-07-19 15:54:31 +05:00
gshchepa/uchum@gleb.loc
d5c8c8cc66 mysqldump.result:
Post-merge fix.
2007-07-19 14:56:04 +05:00
gshchepa/uchum@gleb.loc
7481113f1b Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-19 14:23:53 +05:00
svoj@mysql.com/june.mysql.com
5d4a134f8f BUG#26325 - TEMPORARY TABLE "corrupt" after first read, according
to CHECK TABLE

CHECK/REPAIR TABLE reports "File not found" error when issued
against temporary table.

Fixed by disabling a brunch of code (in case it gets temporary table)
that is responsible for updating frm version as it is not needed
for temporary tables.
2007-07-19 13:51:31 +05:00
gshchepa/uchum@gleb.loc
77ec161c42 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28524
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-19 10:54:39 +05:00
tsmith@ramayana.hindu.god
27ef95237d Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-07-18 15:32:22 -06:00
tsmith@ramayana.hindu.god
f4309e1777 ddl_i18n_utf8.test, ddl_i18n_koi8r.test:
Don't run test with embedded server; requires external client connections
2007-07-18 15:31:24 -06:00
istruewing@chilla.local
0f355a4696 Post-merge fixes
Fixed debug code of new query cache implementation.
2007-07-18 20:52:55 +02:00
cmiller@zippy.cornsilk.net
4463163c11 Re-set the plugin name so that we can be sure the plugin init()
function doesn't set it to something else.
2007-07-18 13:37:56 -04:00
cmiller@zippy.cornsilk.net
5d0b7dea04 Move the filling of the table_name column above the initialization,
so that the init function has access to the name.
2007-07-18 12:27:54 -04:00
gkodinov/kgeorge@magare.gmz
d5a0cf134b 5.0-opt -> 5.1-opt merge 2007-07-18 18:08:05 +03:00
gshchepa/uchum@gleb.loc
3f91aedadb Fixed bug #28524.
For each view the mysqldump utility creates a temporary table
with the same name and the same columns as the view 
in order to satisfy views that depend on this view.
After the creation of all tables, mysqldump drops all
temporary tables and creates actual views.
However, --skip-add-drop-table and --compact flags disable
DROP TABLE statements for those temporary tables. Thus, it was
impossible to create the views because of existence of the
temporary tables with the same names.
2007-07-18 19:14:48 +05:00
kent@mysql.com/kent-amd64.(none)
4ca632bfc3 CMakeLists.txt, configure.js:
Allow to set mysqld exe suffix
2007-07-18 15:53:10 +02:00
kent@kent-amd64.(none)
96dfe76d93 Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
2007-07-18 15:43:20 +02:00
kent@mysql.com/kent-amd64.(none)
7c1d25d9f9 CMakeLists.txt, configure.js:
Allow to set mysqld exe suffix
2007-07-18 15:42:36 +02:00
kostja@bodhi.(none)
198b97a625 Add a test case for Bug#22427 create table if not exists + stored
function results in inconsistent behavior.

The bug itself was fixed by the patch for bug 20662.
2007-07-18 17:09:03 +04:00
gkodinov/kgeorge@magare.gmz
aeddb42304 Merge magare.gmz:/home/kgeorge/mysql/work/B29325-my_errno-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-5.1-opt
2007-07-18 15:57:17 +03:00
gkodinov/kgeorge@magare.gmz
f6225e2048 Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-5.1-opt
2007-07-18 15:56:29 +03:00
gkodinov/kgeorge@magare.gmz
94535ca828 Bug #29325: create table overwrites .MYD file of other
table (datadir)
Set errno when retunring an error in my_create_with_symlink.
2007-07-18 15:33:41 +03:00
kostja@bodhi.(none)
9bac763cc1 A fix and a test case for Bug#26104 Bug on foreign key class constructor.
Fix the typo in the constructor. Cover a semantic check that previously
never worked with a test.
2007-07-18 16:22:05 +04:00
kostja@bodhi.(none)
98a45e1a0f Add a test case for Bug#27248 Triggers: error if insert affects temporary
table.
The bug itself is yet another manifestation of Bug 26141.
2007-07-18 14:42:06 +04:00