Commit graph

19234 commits

Author SHA1 Message Date
jimw@mysql.com
ca56883011 Merge mysql.com:/home/jimw/my/mysql-4.1-9947
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-01 17:12:30 -07:00
jimw@mysql.com
c3e40306b7 Merge mysql.com:/home/jimw/my/mysql-4.1-11402
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-01 17:11:49 -07:00
jimw@mysql.com
9a5560683f Merge mysql.com:/home/jimw/my/mysql-4.1-10724
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-01 17:10:35 -07:00
sasha@asksasha.com
3055ce9ecc Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
2005-08-01 13:34:04 -06:00
patg@krsna.patg.net
8109934e1d BUG 11104 (same as changeset 1.1891 on the 5.0 tree, but realised this
needed to be fixed in earlier versions)
Fixed the iteration of how substrings are handled with negative indexes in 
SUBSTRING_INDEX
2005-07-31 21:28:52 -07:00
igor@rurik.mysql.com
da33db7558 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-07-31 04:33:15 -07:00
igor@rurik.mysql.com
620f865cbb null_key.result, null_key.test:
Modified test case for bug #12144.
2005-07-31 04:28:01 -07:00
igor@rurik.mysql.com
f8375c6cb3 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-07-31 02:36:21 -07:00
igor@rurik.mysql.com
fea0fb2c8b 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.
2005-07-31 02:32:33 -07:00
sasha@asksasha.com
fa7897c62a updates for BUG#10780 - fixed slave I/O thread running status to No while attempting
to connect
2005-07-29 21:00:28 -06:00
georg@lmy002.wdf.sap.corp
10615d54fb fix for bug#12665
macro floatget was missing in config-win.h
2005-07-29 14:51:08 +02:00
hf@deer.(none)
c396a32f46 Fix for bug #9508 (query_cache test fails)
notembedded-specific part moved to the new test
2005-07-29 17:14:21 +05:00
joerg@mysql.com
3503b1316e Security fix in "zlib":
- upgrade zlib to 1.2.2
  (originally:  2005/03/23 21:08:13+01:00 serg@serg.mylan )
- fixed linking with zlib
  (originally:  2005/05/24 22:42:43+02:00 lenz@mysql.com )
- one more build fix for zlib.lib - added libpath to the mysql_test_run_new project files
  (originally:  2005/05/25 10:55:21+02:00 lenz@mysql.com )
- Do not build the RPMs statically on i386 by default, only when adding either
  "--with static" or "--define '_with_static 1'" to the RPM build options.
  Static linking really only makes sense when linking against the specially patched
  glibc 2.2.5.
  (originally:  2005/06/14 21:39:08+02:00 lenz@mysql.com )
- Apply security patch to bundled zlib for CAN-2005-2096. (Bug #11844)
  (originally:  2005/07/11 10:37:21-07:00 jimw@mysql.com )
- 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)
  (originally:  2005/07/27 14:55:08+02:00 lenz@mysql.com )
- build the RPM binaries against the bundled zlib, when static linking is requested
  (originally:  2005/07/27 16:42:13+02:00 lenz@mysql.com )
2005-07-29 13:49:25 +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
joerg@mysql.com
1b4e19f3e6 Increase version number (prepare for new build including security fixes in "zlib"). 2005-07-29 11:54:22 +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
sasha@asksasha.com
0abc5c941d testcase for bug 10780 was not added in the previous commit 2005-07-28 19:10:49 -06:00
sasha@asksasha.com
08faad4a4b patch for bug 10780 2005-07-28 19:08:01 -06: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
monty@mysql.com
987edeaa9b Fixed compiler warnings 2005-07-28 21:25:05 +03: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
hf@deer.(none)
c1777cb28b Fix for bug #10226 (mysql_get_client_version not implemented) 2005-07-28 19:25:48 +05:00
hf@deer.(none)
9d39e4a59c Additional fix for #12177 (stderr isn't closed) 2005-07-28 17:18:24 +05: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
hf@deer.(none)
67e5b2c83c Fix for bug #11083 (myisam test fails witout-geometry) 2005-07-27 21:54:02 +05: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
hf@deer.(none)
30dd658d41 addition to the fix for bug #12177(error log file isn't closed) 2005-07-27 19:39:59 +05: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
hf@deer.(none)
f67896bb31 Fix for bug #12177 (error file isn't closed) 2005-07-27 17:34:20 +05: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
joreland@mysql.com
c0b4c8f13d ndb - only run ndb_config test when using "default" config 2005-07-26 16:12:17 +02: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