Commit graph

19059 commits

Author SHA1 Message Date
lenz@mysql.com
9217c90a77 - Fixed the Requires: tag for the server RPM (BUG#12233), make sure to list all
required commands/packages so the installation succeeds. Removed the superflouus
  Requires field from the source RPM.
2005-08-02 13:59:02 +02:00
lenz@mysql.com
c36a0fa5ac - fixed a typo in C++Files/client/mysqlclient_ia64.dsp: ctype-cp963.c -> ctype-cp932.c
(thanks to JoergB for spotting it)
2005-07-29 12:37:27 +02:00
igor@rurik.mysql.com
a5f2c7528c func_gconcat.result, func_gconcat.test:
Added a test case for bug #12095.
sql_class.h:
  Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
  Added a flag to the TMP_TABLE_PARAM class forcing to put constant
  items generated after elimination of a single row table into temp table
  in some cases (e.g. when GROUP_CONCAT is calculated over a single row
  table).
  bk ci sql/item_sum.cc
  Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
  If GROUP_CONCAT is calculated we always put its argument into a temp
  table, even when the argument is a constant item.
sql_select.cc:
  Fixed bug #12095: a join query with GROUP_CONCAT over one row table.
  If temp table is used to calculate GROUP_CONCAT the argument should
  be always put into this table, even when it is a constant item.
2005-07-28 19:11:29 -07:00
igor@rurik.mysql.com
f503c4152d null_key.test, null_key.result:
Made the test case for bug #12144 independent on other tests.
2005-07-28 17:53:51 -07:00
igor@rurik.mysql.com
dbec0c6e95 null_key.test, null_key.result:
Modified the test case for patch of the bug #12144
  to display status of Handler_read_next before and
  after the tested query.
2005-07-28 16:04:47 -07:00
igor@rurik.mysql.com
f31625e613 Manual merge 2005-07-28 13:39:06 -07:00
igor@rurik.mysql.com
bcbde8af22 sql_select.cc:
Fixed bug #12144.
  Added an optimization that avoids key access with null keys for the 'ref'
  method when used in outer joins. The regilar optimization with adding
  IS NOT NULL expressions is not applied for outer join on expressions as
  the predicates of these expressions are not pushed down in 4.1.
null_key.result, null_key.test:
  Added a test case for bug #12144.
2005-07-28 13:31:15 -07:00
joerg@mysql.com
16963e6dc1 Manually merging 4.1.13a into general 4.1 2005-07-28 18:39:42 +02:00
joerg@mysql.com
2e4d2e221d Combining zlib security fixes for version 4.1.13a:
Fix for CAN-2005-1849 from zlib-1.2.3
   (originally:  2005/07/27 14:55:08+02:00 lenz@mysql.com )
Ensure static linking takes the bundled libraries
   (originally:  2005/07/27 16:42:13+02:00 lenz@mysql.com )
Version number change.
2005-07-28 18:25:58 +02:00
monty@mysql.com
3c12d0ae54 Added end marker for tests to make future merges easier 2005-07-28 03:22:47 +03:00
monty@mysql.com
d28f576cf4 We have also to test 'conds' even if there was no tables.
(This is because conds may not be a constant)
This bug caused a failure in the test suite for select.test becasue for prepared statements in one case a 'constant sub query' was not regarded as a constant
Sanja will as a separate task check if we can fix that the sub query can be recognized as a constant
Bug #12217
2005-07-27 22:58:55 +03:00
lenz@mysql.com
a5b6057db5 - build the RPM binaries against the bundled zlib, when static linking is requested 2005-07-27 16:42:13 +02:00
lenz@mysql.com
981d97e787 - applied a security fix to inftrees.h from the bundled zlib to resolve a second
potential zlib security vulnerability (CAN-2005-1849). Fix was taken from the
  official zlib-1.2.3 distribution (no other zlib-1.2.3 changes were applied)
2005-07-27 14:55:08 +02:00
monty@mysql.com
af6863e7d0 Moved test for 'show full processlist' to not_embedded_server.test becasue it could fail on a slow computer where previous connections has not yet disconnected 2005-07-27 13:45:06 +03:00
monty@mysql.com
24d45c5c30 Merge mysql.com:/home/my/mysql-4.0
into  mysql.com:/home/my/mysql-4.1
2005-07-27 13:24:59 +03:00
monty@mysql.com
3f6023c76e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2005-07-27 13:19:54 +03:00
monty@mysql.com
e59360ac86 Review of new code:
Change argument order to be database, tablename for some functions
2005-07-27 13:05:30 +03:00
hf@deer.(none)
a6a57d061d Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.11329
2005-07-27 13:00:30 +05:00
hf@deer.(none)
a18855bfc5 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.9110
2005-07-27 12:54:32 +05:00
hf@deer.(none)
059d852d83 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.10839
2005-07-27 12:45:31 +05:00
hf@deer.(none)
475566aabd Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.6740
2005-07-27 12:32:39 +05:00
marko@hundin.mysql.fi
f18796bc51 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  hundin.mysql.fi:/home/marko/mysql-4.1
2005-07-26 23:15:12 +03:00
hf@deer.(none)
a776edbed1 Fix for bug #11329 (lowercase_table.test fails) 2005-07-26 20:59:43 +05:00
monty@mysql.com
4098c40d87 Review fixes:
Fixed portability problem with bool in C programs
Moved close_thread_tables out from LOCK_thread_count mutex (safety fix)
my_sleep() -> pthread_cond_timedwait()
2005-07-26 17:55:58 +03:00
bar@mysql.com
92e7d181f9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b12109
2005-07-26 16:48:32 +05:00
bar@mysql.com
637ec56206 ctype-big5.c:
ctype-cp932.c:
ctype-gbk.c:
ctype-mb.c:
ctype-simple.c:
ctype-sjis.c:
ctype-ucs2.c:
ctype-ujis.c:
ctype-utf8.c:

  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
2005-07-26 16:38:10 +05:00
marko@hundin.mysql.fi
a89939c8e7 InnoDB: Do not flush after each write, not even when creating the
data files.  Previously, writes were flushed until the doublewrite
buffer was created.  That would be too slow on systems where
os_file_flush() [or fsync(2)] is slow.  (Bug #12125)
2005-07-26 14:03:34 +03:00
bar@mysql.com
31b1bdc52a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b10201
2005-07-26 12:53:06 +05:00
bar@mysql.com
0c2035b7bd func_gconcat.result, func_gconcat.test:
Adding test
item_sum.cc:
  Adding a call for collation/charset aggregation,
      to collect attributes from the arguments. The actual bug fix.
item_func.h, item_func.cc, item.h, item.cc:
  - Removing collation aggrgation functions from Item_func class
      in item.cc, and adding it as non-class functions in item.cc
      to be able to reuse this code for group_concat.
      - Adding replacement for these functions into Item_func class
      as wrappers for moved functions, to minizize patch size,
2005-07-26 12:52:02 +05:00
hf@deer.(none)
9bab1c09a6 Fix for bug #9110 (Max_join_size error) 2005-07-26 12:08:00 +05:00
joreland@mysql.com
d3567611c6 Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-26 08:02:23 +02:00
joreland@mysql.com
be8d46028f ndb_config test requires ndb 2005-07-26 07:59:10 +02:00
bar@mysql.com
975b4969a5 charset.c:
Bug#12109 possible locking bug in init_available_charset
  Recheck charset_initialized inside locked code,
  to garantee two threads are not entering
  consequently.
2005-07-25 21:34:20 +05:00
lenz@mysql.com
ef3bc773db Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-07-25 15:22:42 +02:00
lenz@mysql.com
5dc9a48594 Merge mysql.com:/space/my/mysql-4.1-merge
into mysql.com:/space/my/mysql-4.1
2005-07-25 15:19:27 +02:00
lenz@mysql.com
0c30acae32 - merge from 4.0: updated scripts/Makefile.am to properly create but not install
make_binary_distribution, make_sharedlib_distribution and make_win_src_distribution
- removed make_win_binary_distribution.sh
2005-07-25 14:39:23 +02:00
lenz@mysql.com
d9bacfa236 - Make sure the scripts make_binary_distribution, make_sharedlib_distribution and
make_win_src_distribution are created, but not installed
- removed make_win_binary_distribution.sh as it's obsolete and outdated
2005-07-25 14:14:24 +02:00
joreland@mysql.com
ca6eb7c70a Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-25 13:48:34 +02:00
joreland@mysql.com
0cd9e2e269 fix compile error 2005-07-25 13:47:40 +02:00
joreland@mysql.com
01f5d4effd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-25 12:48:24 +02:00
joreland@mysql.com
7040b3277a Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-25 12:42:32 +02:00
joreland@mysql.com
07cdfdca69 ndb - Fix LCP during SR parameters 2005-07-25 12:41:25 +02:00
hf@deer.(none)
f8da80e177 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.10839
2005-07-25 14:38:22 +05:00
georg@lmy002.wdf.sap.corp
5498a13751 fix for bug #7924.
added export symbols mysql_server_init and 
mysql_server_end to allow client to connect to external and embedded
server using the same code (required for Connector/OO.org). (Backport from 5.0 - cs. 1.35)
2005-07-25 07:51:17 +02:00
joreland@mysql.com
b285050e52 ndb - add mysql-test-run test case for ndb_config 2005-07-24 17:35:39 +02:00
hf@deer.(none)
ce3269c667 Fix for bug #10893 (myisamchk fails on packed spatial)
need to be fixed in 4.1
2005-07-23 20:04:15 +05:00
hf@deer.(none)
ded44df2b5 Fix for bug #6710 (CREATE FUNCTION fails with 'Unknown error') 2005-07-23 17:21:27 +05:00
joreland@mysql.com
5490cdfb24 Add tool to extract config info from ndb_mgmd 2005-07-23 12:06:02 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
ca0803a024 Undefined RINT for Netware. 2005-07-23 01:11:29 +03:00
jimw@mysql.com
535ba76b98 Merge mysql.com:/home/jimw/my/mysql-4.1-10407
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-22 11:57:34 -07:00