Commit graph

24865 commits

Author SHA1 Message Date
elliot@mysql.com
98dc8e3242 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
into  mysql.com:/Users/emurphy/src/work/mysql-5.0-bug11567
2005-07-18 22:27:20 -04:00
pekka@mysql.com
8cb9f0ef49 ndb - bug#11355 some fixes to index drop etc 2005-07-19 04:01:46 +02:00
jimw@mysql.com
c5b433c3b3 Fix default for sql_mode so that proc table is actually created
by mysql-test-run.pl. (Bug #11954)
2005-07-18 18:36:48 -07:00
patg@radha.local
164255fc81 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  radha.local:/Users/patg/mysql-build/mysql-5.0
2005-07-19 03:18:54 +02:00
jimw@mysql.com
48536b7668 Merge mysqldev@production.mysql.com:jimw/mysql-5.0-readline
into  mysql.com:/home/jimw/my/mysql-5.0-readline
2005-07-18 18:04:52 -07:00
patg@radha.local
e2d8644053 Eric's implentation of OPTIMIZE TABLE and REPAIR TABLE,
as well as changes to the test.
2005-07-19 03:04:51 +02:00
jimw@mysql.com
7d7a4626fc Reimplement use of "config_readline.h" to get readline configuration. 2005-07-18 18:00:19 -07:00
jimw@mysql.com
7cf58d1f86 Upgrade bundled readline to version 5.0. 2005-07-18 17:22:38 -07:00
jimw@mysql.com
aff38d8659 Handle systems where 127.0.0.1 doesn't always map to 'localhost'
first. (Bug #11822)
2005-07-18 17:00:37 -07:00
jimw@mysql.com
dd2f631ec4 Fix number to date conversion so it always honors the NO_ZERO_DATE,
NO_ZERO_IN_DATE, and INVALID_DATES bits of SQL_MODE. (Bug #5906)
2005-07-18 16:12:44 -07:00
konstantin@mysql.com
52ba7b69d7 After-merge fixes. 2005-07-19 03:01:25 +04:00
mronstrom@mysql.com
2d23c691f7 Bug #10600
remove_table_from_cache fails to signal other thread and gets
blocked when other thread also gets blocked
2005-07-19 00:29:19 +02:00
elliot@mysql.com
44f959ae81 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
into  mysql.com:/Users/emurphy/src/work/mysql-5.0-bug11567
2005-07-18 17:55:26 -04:00
elliot@mysql.com
22be12ab86 BUG#11567 Fixed binlog tests on windows. 2005-07-18 17:47:26 -04:00
konstantin@mysql.com
52b8928b09 Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
into  mysql.com:/home/kostja/mysql/mysql-5.0-merge
2005-07-19 00:55:37 +04:00
shuichi@mysql.com
8e60817dda Fixed the ucs2 -> eucjpms conversion bug (bug#11717) 2005-07-18 13:38:56 -07:00
konstantin@mysql.com
086c3206f0 Fix BUILD/autorun.sh to really bail out on error. 2005-07-18 21:33:05 +04:00
monty@mishka.local
21ae963205 Fixes to previous changeset
get_defaults_file() -> get_defaults_options()
2005-07-18 20:05:30 +03:00
monty@mishka.local
2278e0319c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.local:/home/my/mysql-5.0
2005-07-18 19:03:01 +03:00
evgen@moonbone.local
2275976fd5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/mysql-5.0-bug-11482
2005-07-18 20:03:00 +04:00
evgen@moonbone.local
e75e566469 Merge moonbone.local:/work/mysql-4.1-bug-11868
into moonbone.local:/work/mysql-5.0-bug-11482
2005-07-18 19:37:42 +04:00
georg@lmy002.wdf.sap.corp
dfe50c5a97 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
2005-07-18 17:34:30 +02:00
evgen@moonbone.local
0fda7038f9 select.test:
Changed test case comment to be more meaningful
2005-07-18 19:34:29 +04:00
evgen@moonbone.local
a6c63a18c3 Manual merge 2005-07-18 18:38:14 +04:00
evgen@moonbone.local
6e9447a80e Fix bug#11482 4.1.12 produces different resultset for a complex query
than in previous 4.1.x

Wrongly applied optimization were adding NOT NULL constraint which results in
rejecting valid rows and reduced result set.

The problem was that add_notnull_conds() while checking subquery were adding
NOT NULL constraint to left joined table, to which, normally, optimization 
don't have to be applied.
2005-07-18 18:30:19 +04:00
reggie@linux.site
8f605428cb Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into  linux.site:/home/reggie/bk/bug7142
2005-07-18 08:03:59 -06:00
konstantin@mysql.com
8b3d39163a Alleviate the autoconf requirement. 2005-07-18 18:03:58 +04:00
gbichot@production.mysql.com
4853da1ae7 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into production.mysql.com:/nfstmp1/guilhem/mysql-4.1-prod
2005-07-18 14:51:13 +02:00
gbichot@production.mysql.com
7cd2fb13ff Fix for BUG#12003 "assertion failure in testsuite (double lock of
LOCK_thread_count)" and for BUG#12004 "SHOW BINARY LOGS reports 0
for the size of all binlogs but the current one".
There are a lot of 4.1->5.0 unmerged changes (hardest are in the optimizer), can't merge; still pushing in 4.1 because my changes 
are very small. Feel free to ask me if you have problems merging them.
2005-07-18 14:46:53 +02:00
monty@mishka.local
78c65b5adc Cleanups during review
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
2005-07-18 15:33:18 +03:00
joerg@mysql.com
b323a77375 QNX does not know "uint", so the cast is rewritten as "unsigned int". 2005-07-18 13:52:18 +02:00
lenz@mysql.com
00c3b9438d Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-07-18 11:31:11 +02:00
lenz@mysql.com
e1d75fb4c3 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-07-18 11:25:09 +02:00
pekka@mysql.com
30feab4c9a Merge mysql.com:/space/pekka/ndb/version/my50
into  mysql.com:/space/pekka/ndb/version/my50-ndb
2005-07-18 10:10:07 +02:00
stewart@mysql.com
0eb6a68e2c Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-07-18 15:02:21 +10:00
patg@krsna.patg.net
1394b43949 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-5.0
2005-07-17 10:20:11 -07:00
igor@rurik.mysql.com
54dd7e5ebf select.result, select.test:
Added a test case for bug #11745.
sql_select.cc:
  Fixed bug # 11745.
  Added support of where clause for queries with FROM DUAL.
sql_yacc.yy:
  Fixed bug # 11745.
  Added optional where clause for queries with FROM DUAL.
2005-07-17 09:46:14 -07:00
pekka@mysql.com
c7d9eebed7 Merge mysql.com:/space/pekka/ndb/version/my50
into  mysql.com:/space/pekka/ndb/version/my50-ndb
2005-07-17 11:49:35 +02:00
patg@radha.local
dd129ed329 Federated Storage Engine, bug 9925 "Federated query processor (step 2 or step 3) not using logic in
WHERE statement"
2005-07-17 04:10:19 +02:00
igor@rurik.mysql.com
553f2a59f3 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-07-16 18:28:09 -07:00
igor@rurik.mysql.com
bff3507b1d func_in.result, func_in.test:
Fixed bug #11885.
sql_select.cc:
  Fixed bug #11885.
  Predicates of the forms 'a IN (v)' 'a NOT IN (v)' now
  is replaced by 'a=v' and 'a<>v' at the parsing stage.
sql_yacc.yy:
  Fixed bug #11885.
  Predicates of the forms 'a IN (v)' 'a NOT IN (v)' now 
  is replaced by 'a=v' and 'a<>v' at the parsing stage.
2005-07-16 18:06:34 -07:00
igor@rurik.mysql.com
6ea960c8d6 opt_range.cc:
Fixed bug #11853.
  Corrected the code of the range optimization for
  NOT IN and NOT BETWEEN.
range.test, range.result:
  Fixed bug #11853.
2005-07-16 08:19:20 -07:00
konstantin@mysql.com
8b0adacbc6 After-merge fixes (4.1 -> 5.0). 2005-07-16 16:10:42 +04:00
konstantin@mysql.com
8e72214d74 Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/media/sda1/mysql/mysql-5.0-merge
2005-07-16 13:45:32 +04:00
timour@mysql.com
ff0c7f22cf Added test for Bug #11521
"Negative integer keys incorrectly substituted for 0 during range analysis."

The problem is that the range optimizer incorrectly replaces any negative
constant with '0' for all types except BIGINT because the method save_in_field()
casts negative integers to non-negative. This causes incorrect query
results where (0 = any_negative_number).

The problem caused by this bug is fixed by the patch for BUG#11185.
That patch constitutes an optimization due to which the problem code is
never called with negative constants. This patch adds a test so we are sure
that the problem does not reappear.
2005-07-16 10:30:25 +03:00
georg@lmy002.wdf.sap.corp
912fef706a cs fixes 2005-07-16 09:19:23 +02:00
georg@lmy002.wdf.sap.corp
83cf055d0c Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql-5.0
2005-07-16 09:13:31 +02:00
bell@sanja.is.com.ua
f4f9b853dd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
2005-07-16 08:35:21 +03:00
georg@lmy002.wdf.sap.corp
53c630a524 Restore previous used client charset in mysql_reconnect
Moved mysql_set_character_set function to client.c
Changed function prototype for mysql_set_character_set (as suggested
by Konstantin)
2005-07-16 07:13:40 +02:00
jimw@mysql.com
c61ce0d90d Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-15 18:59:18 -07:00