Commit graph

18992 commits

Author SHA1 Message Date
bar@mysql.com
bd35a72d8a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b11216
2005-07-21 16:43:06 +05:00
joreland@mysql.com
d9f7fbe73f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-21 13:27:09 +02:00
bar@mysql.com
6d912fb2ac ctype-latin1.c:
removing extra empty line
  ,
2005-07-21 16:19:08 +05:00
bar@mysql.com
6a97af8a02 Bug#11216: 'show character set' describes latin1 incorrectly
Index.xml:
  Fixing latin1 comment:
  it is actually cp1252, not iso-8859-1
ctype_latin1.result:
  changeing test results accordingly.
ctype-latin1.c:
  Fixed to- and from-Unicode conversion maps
  for better Unicode round trip of undefined
  characters.
2005-07-21 16:05:19 +05:00
lenz@mysql.com
7f758438c8 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-07-21 12:55:39 +02:00
joreland@mysql.com
12d6820834 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-21 12:43:38 +02:00
joreland@mysql.com
5939b37f29 Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-21 11:15:44 +02:00
joreland@mysql.com
a7830ed93c bug#11942 - ndb - backup during DDL
fix bug introduced in alter table
2005-07-21 11:13:07 +02:00
lenz@mysql.com
1a305963b7 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-07-21 10:15:08 +02:00
bar@mysql.com
b11e78381a ctype-cp932.c:
After backporting from 5.0 fix.
  There is no an extra argument in 4.1.
2005-07-21 13:10:27 +05:00
joreland@mysql.com
99744a9fd8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-21 09:35:42 +02:00
lenz@mysql.com
805ff29108 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-07-21 09:12:49 +02:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ac6623f08f Fix merge 2005-07-20 22:30:34 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
9663b9a974 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0
into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
2005-07-20 21:58:33 -04:00
lenz@mysql.com
64e4c5ff98 - Manually merged fixes for BUG#12057 (*.plist (Mac OS X) files are installed on Linux) 2005-07-20 21:47:10 +02:00
mronstrom@mysql.com
4cb963439a Bug #10600 After review fixes 2005-07-20 21:19:01 +02:00
lenz@mysql.com
ca9087a82c - don't install the Mac OS X support files when running "make install" -
they're not needed outside of the source tree (BUG#12057)
- Removed some more unneeded files from "make install" along the way
2005-07-20 19:15:48 +02:00
tomas@poseidon.ndb.mysql.com
3d0d5eb25b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-07-20 18:58:51 +02:00
tomas@poseidon.ndb.mysql.com
6ca09e8b8f Bug #12055 NDB temp tables created by ALTER TABLE are usable
- do not discover temporary files and make them visible
2005-07-20 18:40:55 +02:00
joreland@mysql.com
96272a6c52 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-20 14:25:46 +02:00
georg@lmy002.wdf.sap.corp
dc0645f7cf Merge grichter@bk-internal.mysql.com:/home/bk/mysql-4.1
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-4.1
2005-07-20 13:32:43 +02:00
joreland@mysql.com
07aab2139b Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-20 13:32:20 +02:00
georg@lmy002.wdf.sap.corp
3468c8485d cs fixes from last commit 2005-07-20 13:31:45 +02:00
joreland@mysql.com
bb73ba0902 bug#11942 - ndb backup
fix error code to avoid clash with 5.0/5.1
2005-07-20 13:21:49 +02:00
joreland@mysql.com
884559e3bf bug#11942 - ndb backup with parallell DDL
add testcase to autotest
2005-07-20 12:39:45 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
0f7639ba15 Added some missing casts and changed a define for alloca(). 2005-07-20 13:27:57 +03:00
joreland@mysql.com
9f707b6734 bug#11942 2005-07-20 11:48:48 +02:00
bar@mysql.com
8564322500 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.innolike
2005-07-20 11:00:33 +05:00
jimw@mysql.com
bb6918e312 Merge mysql.com:/home/jimw/my/mysql-4.1-7249
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-19 10:35:15 -07:00
monty@mishka.local
292aefeeca Fixed some test cases that was not forgotten in a recent patch 2005-07-19 19:47:54 +03:00
monty@mishka.local
29d9aa65f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mishka.local:/home/my/mysql-4.1
2005-07-19 19:28:26 +03:00
monty@mishka.local
7e83d09ce7 Simple fixes during review of new code 2005-07-19 19:25:05 +03:00
georg@lmy002.wdf.sap.corp
3e1ae2633a fix for bug#12001 2005-07-19 17:31:18 +02:00
georg@lmy002.wdf.sap.corp
21a88afeed minor fix (backport from 5.0) - changed function prototype/definition 2005-07-19 17:12:00 +02:00
tulin@dl145b.mysql.com
c9abae2ce2 printout of cluster config to use same tokens as documentation 2005-07-19 16:34:56 +02:00
tulin@dl145b.mysql.com
2f01676b37 ConfigInfo.cpp:
BUG#12028, cannot use default section for hostname in cluster config
  made clearer error message
2005-07-19 15:25:55 +02:00
tulin@dl145b.mysql.com
74438e6683 BUG#12028, cannot use default value for HostName in cluster config
+ added switch --print-full-config
+ removed unused REP configuration
2005-07-19 14:33:38 +02:00
tulin@dl145b.mysql.com
1c2cfd80a2 perror.c:
BUG#11999, incorrect --help on perror with ndb
2005-07-19 11:52:24 +02: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
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
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
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
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
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
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
evgen@moonbone.local
52569ad519 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/mysql-4.1-bug-11868
2005-07-16 05:59:17 +04:00