Commit graph

29544 commits

Author SHA1 Message Date
igreenhoe@mysql.com
fe9b9c61d2 Merge mysql.com:/home/greenman/workspace-mysql/mysql/mysql-5.0
into  mysql.com:/home/greenman/workspace-mysql/mysql/bug-5.0-16240
2006-04-06 10:42:34 -07:00
sergefp@mysql.com
f962fa5b91 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/psergey/mysql-5.0-bug18237-review
2006-04-06 21:42:33 +04:00
sergefp@mysql.com
be0ebd9e0a Remove redundant code in opt_sum_query() 2006-04-06 21:42:03 +04:00
igreenhoe@mysql.com
84bfed689d Fix for Bug #16240 2006-04-06 10:13:46 -07:00
svoj@april.(none)
85ff7bec70 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0
2006-04-06 15:25:39 +05:00
svoj@april.(none)
209682e051 Fix for bug#14945 "Truncate table doesn't reset the auto_increment
counter".

When TRUNCATE TABLE was called within an stored procedure the
auto_increment counter was not reset to 0 even if straight
TRUNCATE for this table did this.

This fix makes TRUNCATE in stored procedures to be handled exactly
in the same way as straight TRUNCATE. We achieve this by rolling
back the fix for bug 8850, which is no longer needed since stored
procedures don't require prelocked mode anymore (and TRUNCATE is
not allowed in stored functions or triggers).
2006-04-06 15:19:01 +05:00
msvensson@shellback.(none)
cd15f309fb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-04-06 10:34:41 +02:00
bar@mysql.com
13b5cdb126 Moving mysql_get_server_version() from libmysql.c to client.c,
as it is now required by mysql_set_character_set()
2006-04-06 13:03:22 +05:00
bar@mysql.com
14846536a4 client.c:
Bug#18830 incompatibility new libraries with old server
  Additional 5.0 fix:
  applying the same patch to client.c.
2006-04-06 12:43:13 +05:00
bar@mysql.com
6a847761f1 Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0
2006-04-06 12:38:24 +05:00
bar@mysql.com
45a3bb57d6 libmysql.c:
Bug#18830: incompatibility new libraries with old server
  Don't execute SET NAMES with pre-4.1 server.
2006-04-06 11:47:46 +05:00
bar@mysql.com
0459d69d7a Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0
2006-04-06 10:53:42 +05:00
bar@mysql.com
925ea02b4c This problem has already been fixed by one of the previous changes.
Adding test case to cover queries which worked incorrectly earlier:
Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
2006-04-06 10:51:23 +05:00
bar@mysql.com
a83d206811 ctype-extra.c:
Using local.
2006-04-06 10:23:42 +05:00
bar@mysql.com
743f96da9c Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0
2006-04-06 10:21:33 +05:00
bar@mysql.com
8f1bddb8ed conf_to_src.c:
Backporting a 5.0 change:
  MAX_BUF was too small for Index.xml
  Changeing MAX_BUF and adding assert to easier
  catch the same problem in the future.
ctype-extra.c:
  Regenerating ctype-extra.c with the fixed conf_to_src.
2006-04-06 10:17:01 +05:00
igor@rurik.mysql.com
e732d0536f Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-05 14:06:34 -07:00
bar@mysql.com
52220d2d79 conf_to_src.c:
Buffer was too small to load Index.xml.
  So some charsets were not gerenrated.
  Making the buffer bigger, and adding an DBUG_ASSERT,
  to easier catch the problem in the future.
ctype-extra.c:
  Additional charsets were generated.
2006-04-05 19:43:38 +05:00
evgen@sunlight.local
d07240599d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into sunlight.local:/local_work/16281-bug-5.0-mysql
2006-04-05 13:30:51 +04:00
evgen@sunlight.local
b9949ed9c7 Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1
Mutli-table uses temporary table to store new values for fields. With the
new values the rowid of the record to be updated is stored in a Field_string
field. Table to be updated is set as source table of the rowid field.
But when the temporary table creates the tmp field for the rowid field it
converts it to a varstring field because the table to be updated was created by
the v4.1. Due to this the stored rowids were broken and no records for 
update were found.

The flag can_alter_field_type is added to Field_string class. When it is set to
0 the field won't be converted to varstring. The Field_string::type() function 
now always returns MYSQL_TYPE_STRING if can_alter_field_type is set to 0.
The multi_update::initialize_tables() function now sets can_alter_field_type
flag to 0 for the rowid fields denying conversion of the field to a varstring
field.
2006-04-05 13:29:04 +04:00
msvensson@shellback.(none)
b0c6455908 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-04-05 10:08:38 +02:00
igor@rurik.mysql.com
f485125968 Fixed bug #18237.
The code in opt_sum_query that prevented the COUNT/MIN/MAX 
optimization from being applied to outer joins  was not adjusted 
after introducing nested joins. As a result if an outer join
contained a reference to a view as an inner table the code of
opt_sum_query missed the presence of an on expressions and
erroneously applied the mentioned optimization.
2006-04-04 12:55:02 -07:00
bar@mysql.com
562386b9a9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0
2006-04-04 15:42:32 +05:00
bar@mysql.com
1c74e21809 After merge fix for Bug#12076 --with-extra-charsets has no effect 2006-04-04 15:40:42 +05:00
igor@rurik.mysql.com
274afed734 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into  rurik.mysql.com:/home/igor/mysql-5.0
2006-04-04 02:50:55 -07:00
tomas@poseidon.ndb.mysql.com
93f1422aca Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-04-04 11:50:54 +02:00
tomas@poseidon.ndb.mysql.com
63f5820217 Bug #18349 Wrong error message "Array index out of bounds... 2006-04-04 11:34:31 +02:00
msvensson@shellback.(none)
d4c7943891 Add option --debugger=NAME and --client-debugger=NAME.
Add support for "--debugger=windbg" and "--debugger=vcexpress"
2006-04-04 09:49:32 +02:00
igor@rurik.mysql.com
c4e61aa478 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-03 21:10:23 -07:00
igor@rurik.mysql.com
26b2c5d7bd Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into  rurik.mysql.com:/home/igor/mysql-5.0
2006-04-03 21:07:27 -07:00
igor@rurik.mysql.com
788463869a Post review changes for the fix of bug #16504. 2006-04-03 21:02:40 -07:00
bpontz@shasta.mysql.com
3ad9bc880d .libs is no longer used when compiling netware 2006-04-03 11:54:09 -04:00
bar@mysql.com
26100744eb Merge mysql.com:/usr/home/bar/mysql-4.1.12076
into  mysql.com:/usr/home/bar/mysql-5.0
2006-04-03 17:24:14 +05:00
bar@mysql.com
2c2ee32b93 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.12076
2006-04-03 17:11:54 +05:00
serg@serg.mylan
a1bf113868 yassl link problem fixed 2006-04-03 12:07:18 +02:00
kent@mysql.com
0298bfaac6 Merge 2006-04-03 03:52:22 +02:00
kent@mysql.com
6783064d02 Makefile.am:
Distribute mysql-test-run.pl
2006-04-03 03:47:28 +02:00
kent@mysql.com
6ba1a85726 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-04-03 03:40:54 +02:00
kent@mysql.com
e1d6c31984 mysql_install_db.sh, MySQLEULA.txt, mysql_install_db.c:
Changed web address order.mysql.com to shop.mysql.com
2006-04-03 03:37:43 +02:00
kent@mysql.com
52db1e450a Makefile.am:
Install Perl mysql-test-run into test directory
2006-04-02 02:10:41 +02:00
igor@rurik.mysql.com
d1bfeb7520 Added a test case for bug #16504.
Results changed after the bug fix.
2006-03-31 23:12:05 -08:00
igor@rurik.mysql.com
af2d79a771 Fixed bug #16504.
Multiple equalities were not adjusted after reading constant tables.
It resulted in neglecting good index based methods that could be
used to access of other tables.
2006-03-31 21:26:17 -08:00
kent@mysql.com
5e28df35af Merge 2006-04-01 05:53:37 +02:00
kent@mysql.com
02c661dbcc Makefile.am:
Let "make install" install mysql-test-run.pl
mysql.spec.sh:
  Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
2006-04-01 05:44:10 +02:00
kent@mysql.com
184011d0c1 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-04-01 04:17:30 +02:00
kent@mysql.com
2128b9fb88 README:
Typo (bug#17167)
2006-04-01 04:13:33 +02:00
kent@mysql.com
f98de2cc35 zlib.m4:
Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
  and search the given include directory first (bug#18369)
2006-04-01 03:49:14 +02:00
kent@mysql.com
90b1a4c770 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-04-01 03:37:13 +02:00
kent@mysql.com
f142410e27 acinclude.m4:
Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
  and search the given include directory first (bug#18369)
2006-04-01 03:28:07 +02:00
kent@mysql.com
2cbc50c509 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-04-01 02:46:32 +02:00