ramil@mysql.com
f6a61875f7
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b15108
2005-12-26 11:18:01 +04:00
serg@serg.mylan
d5d6b51422
remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably scattered all over the source
2005-12-24 14:32:50 +01:00
knielsen@mysql.com
2f1614a9c1
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/mysql/mysql-5.0
2005-12-21 16:05:13 +01:00
knielsen@mysql.com
9dceb4f32e
BUG#15842: Change in "item.cc" adding Item_sp_variable breaks compile on HP-UX 11.23
...
Fix: make explicit conversion to non-constant string (char *).
Backported from 5.1 changeset 1.1968 05/12/19 17:36:20 kent@mysql.com +2 -0
2005-12-21 15:19:11 +01:00
dlenev@mysql.com
74ca27b305
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg14836
2005-12-21 15:02:34 +03:00
paul@snake-hub.snake.net
1b106bf4fc
errmsg.txt:
...
Fix typo.
2005-12-20 12:42:35 -06:00
gluh@eagle.intranet.mysql.r18.ru
f9ef0df0d3
Fix for bug#14271 I_S: columns has no size for (var)binary columns
...
set character_octet_length, character_maximum_length for
binary and varbinary field types
2005-12-19 16:21:02 +04:00
gluh@eagle.intranet.mysql.r18.ru
f4b052844f
Fix for bug#14861 aliased column names are not preserved.
...
Create tmp table filed using original item name when it's necessary
2005-12-19 15:36:03 +04:00
gluh@eagle.intranet.mysql.r18.ru
c8631b414b
Bug#12770 DESC cannot display the info. about temporary table
...
Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
Bug#15224 SHOW INDEX from temporary table doesn't work.
Restore thd->temporary_tables to be able to process
temporary tables(only for 'show index' & 'show columns').
This should be changed when processing of temporary tables for
I_S tables will be done.
2005-12-19 14:46:54 +04:00
kent@mysql.com
63b4ce720a
Merge
2005-12-18 15:26:37 +01:00
knielsen@production.mysql.com
71780fc87e
Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/knielsen/mysql-5.0
2005-12-14 22:40:01 +01:00
ramil@mysql.com
04cff0d055
Fix for bug #15623 : Test case rpl000001 and rpl_error_ignored_table failure on MacOSX
...
and bug #15668 : Test 'sp-error' crashes server on Mac OS X.
2005-12-14 21:42:08 +04:00
ingo@mysql.com
340358481d
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0
2005-12-14 18:20:19 +01:00
kent@mysql.com
8e5b353598
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 16:50:28 +01:00
jonas@perch.ndb.mysql.com
2059a6c174
bug#15682 - ndb
...
incorrect handling of varchar in position/rnd_pos
Commit for 5.0.17 release clone
2005-12-14 15:09:12 +01:00
ingo@mysql.com
374c6b3301
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0
2005-12-14 14:51:22 +01:00
knielsen@production.mysql.com
16e86df69e
Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/knielsen/mysql-5.0
2005-12-14 14:00:35 +01:00
knielsen@mysql.com
44012d40f2
Remove unused class member as suggested by Guilhem.
2005-12-14 13:51:11 +01:00
kent@mysql.com
c11b35d9bf
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 13:18:24 +01:00
kent@mysql.com
45b81ac196
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 13:09:41 +01:00
jonas@perch.ndb.mysql.com
6a02895276
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-12-14 11:34:08 +01:00
jonas@perch.ndb.mysql.com
1864165ff3
bug#15682 - ndb - invalid handling of varchar in position/rnd_pos
2005-12-14 10:57:09 +01:00
ingo@mysql.com
97e3b90f65
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug10932
2005-12-14 10:40:49 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
b7c52afb57
Disabled archive db for Netware.
2005-12-14 02:08:48 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
96f8db34a5
Netware specific changes.
2005-12-14 01:21:56 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
bb6c11bf3b
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-12-14 00:20:55 +02:00
evgen@moonbone.local
012933ce39
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/15268-bug-5.0-mysql
2005-12-13 23:26:35 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
f263c2f5a5
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-12-13 21:55:58 +02:00
aivanov@mysql.com
2e499986aa
Fix BUG#12071: "Windows hang:'Opening tables' or 'Waiting for
...
table' lockup".
Changes from the innodb-5.0-ss92 snapshot.
Do not call os_file_create_tmpfile() at runtime. Instead, create
all tempfiles at startup and guard access to them with mutexes.
2005-12-13 21:35:24 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
13d7abe06f
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-12-13 18:44:20 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
32466b14fb
Minor Netware specific changes.
2005-12-13 18:30:10 +02:00
aivanov@mysql.com
75af3821d7
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss11
2005-12-12 22:46:49 +03:00
jimw@mysql.com
e18679c7ff
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-12 10:11:56 -08:00
aivanov@mysql.com
7ae2d46903
Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting for
...
table' lockup".
Changes from the innodb-4.1-ss11 snapshot.
Do not call os_file-create_tmpfile() at runtime. Instead, create
a tempfile at startup and guard access to it with a mutex.
Also, fix bugs:
10511: "Wrong padding of UCS2 CHAR columns in ON UPDATE CASCADE";
13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN
KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that
datatypes between foreign key references are compatible.
Also, added test cases (also for bug 9802).
2005-12-12 21:06:59 +03:00
ingo@mysql.com
3f9f19e34c
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug10932
2005-12-12 13:24:08 +01:00
ramil@mysql.com
51184adde3
Fix for bug #15630 : Test case failure in sp-dynamic, sp-error, and sp.
2005-12-12 15:57:35 +04:00
kent@mysql.com
2ec5b24d74
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-12 11:58:16 +01:00
aivanov@mysql.com
c34595c975
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/dev/mysql-5.0-14614
2005-12-12 13:16:06 +03:00
ramil@mysql.com
351204834b
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/usr/home/ram/work/mysql-5.0-release
2005-12-12 11:55:49 +04:00
igor@rurik.mysql.com
ede2e0d254
item_sum.h, item.cc:
...
Post review corrections in comments.
2005-12-11 22:21:19 -08:00
aivanov@mysql.com
a61b810508
Fixed BUG #14614 : Replication of tables with trigger generates
...
error message if database is changed.
2005-12-11 17:06:36 +03:00
dlenev@mysql.com
79d83094ad
Fix for bug #14863 "Triggers: crash if create and there is no current database".
...
Now when we create or drop trigger we check that both trigger name and trigger
table always have database part specified. Thus we give an error if it they
are not specified explicitly or implicitly via current database.
2005-12-11 15:26:15 +03:00
igor@rurik.mysql.com
ad53d72033
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-12-10 23:31:03 -08:00
evgen@moonbone.local
2790489cd6
Fix bug #15268 Unchecked null value caused server crash
...
cmp_item_sort_string::cmp() wasn't checking values_res variable for null.
Later called function was dereferenced it and crashed server.
Added null check to cmp_item_sort_string::cmp().
2005-12-09 23:01:52 +03:00
ramil@mysql.com
8eba6be5b7
Fix for bug #15602 : 5.0.17 test case 'create' failure.
2005-12-09 19:55:59 +04:00
konstantin@mysql.com
bbf3a593c9
A fix and a test case for Bug#15441 "Running SP causes Server
...
to Crash": the bug was that due to non-standard name
resolution precedence in stored procedures (See Bug#5967)
a stored procedure variable took precedence over a table column
when the arguments for VALUES() function were resolved.
The implementation of VALUES() function was not designed to work
with Item_splocal and crashed.
VALUES() function is non-standard. It can refer to, and
is meaningful for, table columns only. The patch disables SP
variables as possible arguments of VALUES() function.
2005-12-09 00:58:59 +03:00
jimw@mysql.com
f7ff3d653a
Fix calls to free_underlaid_joins() in INSERT, DELETE, and UPDATE
...
handling so that indexes are closed before trying to commit the
transaction. (Bug #15536 )
2005-12-08 12:33:33 -08:00
kent@mysql.com
48af1d2674
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-08 17:58:17 +01:00
kent@mysql.com
8fd7e5f922
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-12-08 16:15:27 +01:00
kent@mysql.com
e8198e799e
mysqld.cc:
...
Bug#14960, reverted code to make symdir work on Windows
symlink.test:
Disabled test case on Windows
2005-12-08 16:13:53 +01:00