Commit graph

16351 commits

Author SHA1 Message Date
gkodinov@mysql.com
d6b5a89044 Bug #19700: subselect returning BIGINT always returned it as SIGNED
The unsigned flag in Item was not propagated through the single value subqueries.
This caused the result to be treated as signed.
2006-05-25 10:39:18 +03:00
evgen@moonbone.local
d7e831ac62 sql_select.cc:
After merge fix
2006-05-25 00:03:35 +04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
701007fe30 review fix 2006-05-24 15:01:03 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ba75d18bec Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17455
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
2006-05-24 13:56:23 -04:00
reggie@big_geek.
c492b58920 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
into  big_geek.:D:/work/mysql/mysql-5.1-vc71
2006-05-24 12:46:45 -05:00
reggie@big_geek.
4a25f024ee some small fixups 2006-05-24 12:43:03 -05:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
d1098a85eb Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
2006-05-24 13:41:04 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
cb0a4f7423 BUG#19304: Merge handler not part of partitioned tables
Review fix
2006-05-24 13:35:52 -04:00
evgen@moonbone.local
516b8f0aca Manually merged 2006-05-24 20:52:57 +04:00
monty@mysql.com
4064f11acf Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-05-24 17:33:12 +03:00
monty@mysql.com
7cb3df0114 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-05-24 17:32:17 +03:00
monty@mysql.com
9e9ca8b6eb More DBUG statements
Replaced COND_refresh with COND_global_read_lock becasue of a bug in NTPL threads when using different mutexes as arguments to pthread_cond_wait()
The original code caused a hang in FLUSH TABLES WITH READ LOCK in some circumstances because pthread_cond_broadcast() was not delivered to other threads.
This fixes:
Bug#16986: Deadlock condition with MyISAM tables
Bug#20048: FLUSH TABLES WITH READ LOCK causes a deadlock
2006-05-24 17:21:35 +03:00
iggy@mysql.com
3cc64cef9a BUG#18669: Session COM_STATISTICS breaks mysqladmin status.
Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens.
2006-05-24 09:34:36 -04:00
elliot@mysql.com
15f763af84 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0-bug19394
2006-05-24 09:02:55 -04:00
rburnett@bk-internal.mysql.com
9138f0ba6e Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-24 14:57:44 +02:00
serg@mysql.com
c6abfd2f7f Merge mysql.com:/data0/mysqldev/my/mysql-5.0.22-release
into  mysql.com:/data0/mysqldev/my/mysql-5.1-release
2006-05-24 14:37:18 +02:00
serg@mysql.com
c00edb8e8a Merge mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release
into  mysql.com:/data0/mysqldev/my/mysql-5.0.22-release
2006-05-24 14:22:36 +02:00
svoj@april.(none)
551043b3df Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0
2006-05-24 16:59:27 +05:00
serg@mysql.com
1841c44cfc Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release
into  mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release
2006-05-24 12:19:39 +02:00
svoj@april.(none)
0674c702b0 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0
2006-05-24 15:13:49 +05:00
monty@mysql.com
2a2da2f09b Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-05-24 12:09:16 +03:00
monty@mysql.com
97b941d924 Remove dflt_field from field structure as this was only needed when createing temporary table and I found another soultion that doesn't increase the size of the field structure for all table instances. (Better fix for bug #19089)
Fixed compiler warnings
Fixed valgrind warning in Item_date_add_intervall::eq. (Recoding of bugfix #19490)
2006-05-24 11:56:59 +03:00
holyfoot@deer.(none)
8485c574d9 bug #19650 (Embedded crashes in 5.1.10) 2006-05-24 13:28:24 +05:00
knielsen@mysql.com
b03168eb2f Fix missing source file. 2006-05-24 09:28:37 +02:00
brian@zim.(none)
5d9ec1ee82 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-05-23 19:08:28 -07:00
brian@zim.(none)
9368ab52f3 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-05-23 17:33:12 -07:00
kent@mysql.com
97674810b0 don't let bugfix for bug#8303 break the bugfix for bug#8378
revert the fix for bug#8303
correct the test for bug#8378
2006-05-24 00:55:53 +02:00
jimw@mysql.com
e7c78a04eb Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-23 15:13:30 -07:00
cmiller@zippy.(none)
971dc90e3a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0--bug11151
2006-05-23 15:01:05 -04:00
rburnett@bk-internal.mysql.com
37d1e803f1 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-23 20:28:52 +02:00
brian@zim.(none)
b514d3a89c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-05-23 11:25:11 -07:00
msvensson@neptunus.(none)
f25fcf79a5 Bug#19938 Valgrind error (race) in handle_slave_sql() 2006-05-23 20:16:57 +02:00
kent@mysql.com
ade3de74d7 event_scheduler.h, event_scheduler.cc:
Rename load_event() to load_named_event(), to avoid name clash on HP-UX
2006-05-23 17:47:17 +02:00
jani@ua141d10.elisa.omakaista.fi
8dabbe3441 Removed wrong ascii codes from source code.
Fixed core dump in --help
2006-05-23 18:27:54 +03:00
msvensson@neptunus.(none)
0f1ae1305d Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-23 17:05:37 +02:00
andrey@lmy004.
046e77a2e5 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release
2006-05-23 16:51:37 +02:00
andrey@lmy004.
a1c30e4877 __FUNCTION__ is not available everywhere.
make us see at least with gcc the function proto. this can be extended
probably for windows too.
Fix build on intelxeon3 (sun compiler and others)
2006-05-23 16:50:01 +02:00
msvensson@neptunus.(none)
cc9f33283d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-release
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-23 16:30:50 +02:00
cmiller@zippy.(none)
e700e84567 Guilhelm suggested that the "load data infile" command should be flagged as
not transaction-safe for stored procedures.  Related to Bug#11151.
2006-05-23 10:29:58 -04:00
msvensson@neptunus.(none)
12a47bf265 Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-23 16:27:40 +02:00
msvensson@neptunus.(none)
6fb8f4f878 Bug #19938 Valgrind error (race) in handle_slave_sql() 2006-05-23 16:20:03 +02:00
msvensson@neptunus.(none)
ebedae2cb3 Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060523082057|49143 2006-05-23 16:14:48 +02:00
msvensson@neptunus.(none)
4b51242460 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-release
2006-05-23 14:39:30 +02:00
andrey@lmy004.
9670bb6ae4 Merge lmy004.:/work/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release-17619-try3
2006-05-23 13:49:24 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
b756f55af0 BUG#17455: Wrong results from Repair/Optimize .. table for partitioned tables 2006-05-23 07:39:35 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
0bd08dd4b6 BUG#19304: Merge handler allowed in partitioned tables 2006-05-23 07:37:03 -04:00
andrey@lmy004.
86052a9567 various fixes after push of fix for bug#17619 2006-05-23 13:32:22 +02:00
msvensson@neptunus.(none)
7b2e709fb7 Bug#16297 In memory grant tables not flushed when users's hostname is ""
- In function 'handle_grant_struct' when searching the memory structures for an 
   entry to modify, convert all entries here host.hostname is NULL to "" and compare that 
   with the host passed in argument "user_from".
 - A user created with hostname "" is stored in "mysql.user" table as host="" but when loaded into 
   memory it'll be stored as host.hostname NULL. Specifiying "" as hostname means
   that "any host" can connect. Thus is's correct to turn on allow_all_hosts
   when such a user is found. 
 - Review and fix other places where host.hostname may be NULL.
2006-05-23 11:35:14 +02:00
msvensson@neptunus.(none)
5e19424c00 Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-23 10:36:06 +02:00
msvensson@neptunus.(none)
cb7958ce1b Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-05-23 10:34:59 +02:00