Commit graph

31650 commits

Author SHA1 Message Date
joerg@trift2.
e31f8a662c Merge trift2.:/M41/clone-4.1
into  trift2.:/M50/merge-4.1-to-5.0
2006-07-24 16:30:31 +02:00
joerg@trift2.
1419b5c249 Merge trift2.:/M41/push-1-4.1
into  trift2.:/M50/merge-4.1-to-5.0
2006-07-24 16:04:40 +02:00
joerg@trift2.
37408ed0f3 Merge trift2.:/M41/tmp_merge
into  trift2.:/M50/merge-4.1-to-5.0
2006-07-24 15:47:57 +02:00
msvensson@neptunus.(none)
d89f177377 Bug#21125 mysqldump: Problem with non-standard table names
- The mysql-test/std_data/bug15328.cnf file was not copied to install or dist dir.
2006-07-24 14:31:37 +02:00
joerg@trift2.
5ac44f14cb Merge trift2.:/M41/tmp_merge
into  trift2.:/M50/merge-4.1-to-5.0
2006-07-24 14:06:17 +02:00
kroki/tomash@moonlight.intranet
6d05e32d82 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug14702
2006-07-24 15:13:21 +04:00
kroki/tomash@moonlight.intranet
89ea3b01b5 BUG#14702: misleading error message when syntax error in
CREATE PROCEDURE

The bug was fixed already.  This changeset adds a test case.
2006-07-24 15:10:50 +04:00
msvensson@neptunus.(none)
c84cdbf40b Bug#21215 mysqldump creating incomplete backups without warning
- Add call to 'safe_exit' function when db query fails.
2006-07-24 13:10:24 +02:00
kostja@bodhi.local
2ce1a07c89 A fix and a test case for Bug#15752 "Lost connection to MySQL server
when calling a SP from C API"

The bug was caused by lack of checks for misuse in mysql_real_query. 
A stored procedure always returns at least one result, which is the 
status of execution of the procedure itself.
This result, or so-called OK packet, is similar to a result
returned by INSERT/UPDATE/CREATE operations: it contains the overall
status of execution, the number of affected rows and the number of
warnings. The client test program attached to the bug did not read this 
result and ivnoked the next query. In turn, libmysql had no check for 
such scenario and mysql_real_query was simply trying to send that query 
without reading the pending response, thus messing up the communication
protocol.

The fix is to return an error from mysql_real_query when it's called
prior to retrieval of all pending results.
2006-07-24 14:56:53 +04:00
msvensson@neptunus.(none)
9f78d779e3 Don't close connection to mysql before 'safe_exit', that is done in 'safe_exit' if it decides to exit. 2006-07-24 12:48:02 +02:00
msvensson@neptunus.(none)
c2e2ebb1a7 Remove double printout of mysqldump in error message 2006-07-24 12:43:35 +02:00
msvensson@neptunus.(none)
0ab8948c99 Replace sock -> mysql 2006-07-24 12:00:44 +02:00
msvensson@neptunus.(none)
b450438c8b Change tFlag and dFlag into human readable format
tFlag => opt_no_create_info
 dFlag => opt_no_data
2006-07-24 11:56:01 +02:00
msvensson@neptunus.(none)
6c12e990b2 Add function verbose_msg 2006-07-24 11:51:52 +02:00
msvensson@neptunus.(none)
9aa18a4bb6 Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug15690
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-24 11:07:41 +02:00
msvensson@neptunus.(none)
119c5f2682 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-24 11:06:08 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
38afcc3915 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-07-24 10:59:51 +02:00
msvensson@neptunus.(none)
3aa99c062f Bug#10877 mysqldump should use consistent last line
- Add printout in write_footer to tell that mysqldump has completed.
   Ex: -- Dump completed 2006-07-24  8:55:05
2006-07-24 10:56:33 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e22532fd80 mwasmnlm, mwccnlm, mwldnlm:
Filter out strange control characters, messes up logs
2006-07-24 10:55:26 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
2c36a11d08 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b19370
2006-07-23 16:26:12 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
6955f87be4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b19370
2006-07-23 15:45:00 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a03dcf3f47 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b8143
2006-07-23 15:28:50 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
1c04310e30 Fix for bug #8143: A date with value 0 is treated as a NULL value 2006-07-23 15:25:30 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
694d4999ef Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b16327
2006-07-23 14:17:01 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
41ba943964 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b19370
2006-07-23 13:43:44 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a810a2a437 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b10966
2006-07-23 12:58:26 +05:00
igor@olga.mysql.com
74438f31e4 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  olga.mysql.com:/home/igor/mysql-5.0-opt
2006-07-22 12:45:45 -07:00
igor@olga.mysql.com
66ecb7df81 Fixed bug #18925: wrong results for queries with
subqueries on information schema that use MIN/MAX aggregation.

Execution of some correlated subqueries may set the value
of null_row to 1 for tables used in the subquery.
If the the subquery is on information schema it causes
rejection of any row for the following executions of
the subquery in the case when an optimization filtering
by some condition is applied.

The fix restores the value of the null_row flag for 
each execution of a subquery on information schema.
2006-07-22 12:44:54 -07:00
gkodinov/kgeorge@macbook.mshome.net
3cd6780241 Merge office:mysql/autopush/B20466-5.0-opt
into  macbook.mshome.net:/Users/kgeorge/mysql/work/B20466-5.0-opt
2006-07-22 15:18:30 +03:00
gkodinov/kgeorge@rakia.(none)
d45bd0ca9f Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.(none):/home/kgeorge/mysql/autopush/B20868-5.0-opt
2006-07-22 15:18:29 +03:00
sergefp@mysql.com
305788527e Post-merge fixes 2006-07-22 16:18:28 +04:00
gkodinov/kgeorge@rakia.(none)
568712853d Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.(none):/home/kgeorge/mysql/autopush/B20868-5.0-opt
2006-07-22 14:03:42 +03:00
sergefp@mysql.com
d7c1be4bb9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/psergey/mysql-5.0-opt2
2006-07-22 15:03:41 +04:00
gkodinov/kgeorge@rakia.(none)
b539790f52 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.(none):/home/kgeorge/mysql/autopush/B20868-5.0-opt
2006-07-22 09:11:50 +03:00
jimw@rama.(none)
dc0f4a21e6 Bug #19147: mysqlshow INFORMATION_SCHEMA does not work
When a wildcard database name is given the mysqlshow, but that wildcard
  matches one database *exactly* (it contains the wildcard character), we
  list the contents of that database instead of just listing the database
  name as matching the wildcard. Probably the most common instance of users
  encountering this behavior would be with "mysqlshow information_schema".
2006-07-21 20:29:25 -07:00
evgen@moonbone.local
edc2c4bb81 field.h:
Fixed typo.
2006-07-22 05:52:37 +04:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
47a9da936c mysqlmanager.vcproj:
Place mysqlmanager 'pdb' file in 'client_debug' directory
mysys.vcproj:
  Removed define of __NT__ from 'Debug' target
mysqld.vcproj:
  Always generate 'pdb' and 'map' files
2006-07-22 02:00:33 +02:00
sergefp@mysql.com
964a4b5f95 Merge mysql.com:/home/psergey/mysql-4.1-opt
into  mysql.com:/home/psergey/mysql-5.0-opt2
2006-07-22 02:41:29 +04:00
sergefp@mysql.com
59dc5e8838 Add missing "DROP TABLE" clause 2006-07-22 02:36:17 +04:00
evgen@moonbone.local
8540557457 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/work/autopush/12185-bug-5.0-opt-mysql
2006-07-22 02:15:36 +04:00
evgen@moonbone.local
c875b8eb93 Fixed bug#12185: Data type aggregation may produce wrong result
The Item::tmp_table_field_from_field_type() function creates Field_datetime
object instead of Field_timestamp object for timestamp field thus always
changing data type is a tmp table is used.

The Field_blob object constructor which is used in the 
Item::tmp_table_field_from_field_type() is always setting packlength field of
newly created blob to 4. This leads to changing fields data type for example
from the blob to the longblob if a temporary table is used.

The Item::make_string_field() function always converts Field_string objects 
to Field_varstring objects. This leads to changing data type from the 
char/binary to varchar/varbinary.

Added appropriate Field_timestamp object constructor for using in the 
Item::tmp_table_field_from_field_type() function.

Added Field_blob object constructor which sets pack length according to
max_length argument.

The Item::tmp_table_field_from_field_type() function now creates
Field_timestamp object for a timestamp field.

The Item_type_holder::display_length() now returns correct NULL length NULL
length. 

The Item::make_string_field() function now doesn't change Field_string to
Field_varstring in the case of Item_type_holder. 

The Item::tmp_table_field_from_field_type() function now uses the Field_blob
constructor which sets packlength according to max_length.
2006-07-22 02:08:00 +04:00
jimw@rama.(none)
5fda0b99d0 Bug #16881: password() and union select
This was only demonstrated by the use of PASSWORD(), it was not related to
  that function at all. The calculation of the size of a field in the results
  of a UNION did not take into account the possible growth of a string field
  when being converted to the aggregated character set.
2006-07-21 13:28:42 -07:00
kroki/tomash@moonlight.intranet
afb31714c5 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug19207
2006-07-22 00:08:45 +04:00
msvensson@neptunus.(none)
2ea50d6d84 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-21 21:57:05 +02:00
sergefp@mysql.com
9024ed81c7 Merge mysql.com:/home/psergey/mysql-4.1-opt
into  mysql.com:/home/psergey/mysql-5.0-opt
2006-07-21 23:45:34 +04:00
gkodinov/kgeorge@macbook.mshome.net
0282028292 Bug #20466: a view is mixing data when there's a trigger on the table
When making a place to store field values at the start of each group
  the real item (not the reference) must be used when deciding which column
  to copy.
2006-07-21 20:44:35 +03:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
95197805e2 Merge bk://anubis/mysql-5.0-engines
into  xiphis.org:/home/antony/work2/merge/mysql-5.0
2006-07-21 10:14:25 -07:00
gkodinov/kgeorge@rakia.(none)
98cd0a928f Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.(none):/home/kgeorge/mysql/autopush/B20868-5.0-opt
2006-07-21 18:10:37 +03:00
gkodinov/kgeorge@macbook.gmz
3ef086d263 Bug #20868: Client connection is broken on SQL query error
An aggregate function reference was resolved incorrectly and
caused a crash in count_field_types.
 Must use real_item() to get to the real Item instance through
the reference
2006-07-21 17:59:52 +03:00
ingo/mydev@chilla.local
0b3db56164 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1
into  chilla.local:/home/mydev/mysql-4.1
2006-07-21 14:56:43 +02:00