Commit graph

24966 commits

Author SHA1 Message Date
monty@mishka.local
8437e9c1be Fixes during review of new pushed code
Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
2005-07-31 12:49:55 +03:00
monty@mysql.com
e60d786dde Ensure we free all items for prepared statements
Before the fix in ~Prepared_statments we got a memory leak when executing mysql_client_test.test
Note that test 'variables.test' fails.
This will be fixed when Jimw pushes the fix for Bug 10351
2005-07-29 05:06:35 +03:00
monty@mysql.com
16853d5f14 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-07-29 04:41:14 +03:00
sergefp@mysql.com
e5ba8ba521 Remove Item_func::NOTLIKE_FUNC and all [dead] code that uses it 2005-07-29 03:37:06 +02:00
monty@mysql.com
8427dfd46e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-07-29 03:33:04 +03:00
sergefp@mysql.com
c0fcabce45 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-28jul-look
2005-07-29 00:33:03 +00:00
sergefp@mysql.com
6289ba1570 [Patch from Konstantin] Enable InnoDB cursor view functionality. 2005-07-29 00:32:03 +00:00
monty@mysql.com
ef1de7da1d After merge fixes 2005-07-28 21:39:24 +03:00
jimw@mysql.com
2cb78727f6 Merge mysql.com:/home/jimw/my/mysql-5.0-10351
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-28 10:40:44 -07:00
joerg@mysql.com
967bf6d350 Manual merge of 5.0.10a back to the general tree. 2005-07-28 18:30:54 +02:00
monty@mysql.com
15d48525af Merge mysql.com:/home/my/mysql-4.1
into  mysql.com:/home/my/mysql-5.0
2005-07-28 17:09:54 +03:00
monty@mysql.com
b3cbd0048f Cleanups during review of new code
Ensure mysql_close() is called if mysql_set_character_set() fails
2005-07-28 16:10:14 +03:00
marko@hundin.mysql.fi
f0f2738c4c row0sel.c:
row_sel_store_mysql_rec(): Make comment about space padding
  more accurate.
2005-07-28 13:15:36 +03:00
marko@hundin.mysql.fi
4b0d6a3877 row_sel_store_mysql_rec(): Convert NULL true VARCHAR columns
correctly.
2005-07-28 12:30:52 +03:00
gluh@mysql.com
c878d14933 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0
2005-07-28 12:02:42 +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
510d9a19e1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-07-28 01:39:17 +03:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
4df1652294 Missing initialisation of table->s->db in lock_table_name
Bug #12112
2005-07-27 18:13:48 -04: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
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
ramil@mysql.com
5ac378ba15 after-merge fix 2005-07-27 15:57:00 +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
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
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