Commit graph

25056 commits

Author SHA1 Message Date
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
gluh@eagle.intranet.mysql.r18.ru
ef2c7812f3 Fix for bug#12127 triggers do not show in info_schema before they are used if set to the database(2nd version)
use db name of table which trigger belongs to
  instead of thd->db name during trigger body parsing
2005-07-27 16:17:05 +05:00
monty@mysql.com
c26402dce2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-07-27 14:06:54 +03:00
monty@mysql.com
a37a3d3259 Fixed comment 2005-07-27 14:04:10 +03:00
joerg@mysql.com
bcace631ee Fix shortcircuit of 127.0.0.1 -> localhost lookup on little-endian machines. (Bug #11822)
(Originally:   1.1891 05/07/25 12:07:47 jimw@mysql.com )
2005-07-27 13:01:48 +02:00
georg@lmy002.wdf.sap.corp
ea3d541870 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-27 13:01:31 +02:00
ramil@mysql.com
5ac378ba15 after-merge fix 2005-07-27 15:57:00 +05:00
georg@lmy002.wdf.sap.corp
e676faa789 fix for bug#9968 (slow query log contains useless entries)
Query has to be written to the log before calling
thd->set_statement(&stmt_backup), otherwise query will be empty.
Setting thd->enabe_slow_log to FALSE prevents that dispatch_command
logs the (empty) query again.
2005-07-27 12:45:32 +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
ramil@mysql.com
e43dff67f5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/mysql-5.0
2005-07-27 15:09:06 +05: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)
29cfa64f68 Merging 2005-07-27 14:37:16 +05:00
hf@deer.(none)
faef3a442e Merge deer.(none):/home/hf/work/mysql-4.1.11329
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-07-27 13:02:10 +05: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)
41c83870a2 Merge deer.(none):/home/hf/work/mysql-4.1.9110
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-07-27 12:56:23 +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)
f2944dca2a Merging 2005-07-27 12:49:44 +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)
b17a35e06f Merge 2005-07-27 12:39:49 +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
jimw@mysql.com
0536bd6679 Increase allowed size of stored procedure bodies to 4GB, and
produce a sensible error when that limit is exceeded. (Bug #11602)
2005-07-26 18:08:49 -07:00
marko@hundin.mysql.fi
6d6d90d221 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/marko/mysql-5.0
2005-07-26 23:23:08 +03: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
igor@rurik.mysql.com
ffd08ef790 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-07-26 08:25:25 -07:00
igor@rurik.mysql.com
c3feb18396 item.h:
Post review change in Item_ref::get_tmp_table_field (bug #11412).
2005-07-26 08:20:42 -07: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
bfe8ba7de7 Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0
2005-07-26 17:53:18 +05: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
marko@hundin.mysql.fi
5dd8eeef3a Merge hundin.mysql.fi:/home/marko/mysql-4.1
into  hundin.mysql.fi:/home/marko/mysql-5.0
2005-07-26 14:43:48 +03:00
bar@mysql.com
a009ec4a9e Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0
2005-07-26 16:43:47 +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
4a85e560a5 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0
2005-07-26 14:54:40 +05:00
bar@mysql.com
991e344285 Bug#10201 group_concat returns string with binary collation
item.cc:
  After merge fixes.
func_gconcat.result:
  After merge fixes
2005-07-26 14:52:33 +05:00
bar@mysql.com
0255803b4e Merge mysql.com:/usr/home/bar/mysql-4.1.b10201
into  mysql.com:/usr/home/bar/mysql-5.0
2005-07-26 13:25:18 +05: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
jan@hundin.mysql.fi
ae3adcd4c3 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/jan/mysql-5.0
2005-07-26 10:19:36 +03:00
ramil@mysql.com
9f2624ee51 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b11546
2005-07-26 12:19:35 +05:00
ramil@mysql.com
afb1ad8415 a fix (bug #11546: Bad error message from inserting out of range values, SQL_MODE='tradition'). 2005-07-26 12:18:35 +05:00
joreland@mysql.com
c58057346c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.0-push
2005-07-26 09:08:27 +02:00
hf@deer.(none)
9bab1c09a6 Fix for bug #9110 (Max_join_size error) 2005-07-26 12:08:00 +05:00
joreland@mysql.com
1b31399774 ndb - changed config 2005-07-26 09:06:37 +02:00
joreland@mysql.com
3b8275d062 Merge mysql.com:/home/jonas/src/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.0-push
2005-07-26 08:09:38 +02:00
joreland@mysql.com
122758e5c8 Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-5.0
2005-07-26 08:05:06 +02:00