dlenev@mysql.com
10a9434ccd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-28 19:09:28 +03:00
gluh@gluh.mysql.r18.ru
5dfcdcc026
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
2005-01-28 19:09:27 +03:00
gluh@gluh.mysql.r18.ru
0434ecced3
A fix: 'information_schema' test with ps-protocol option fails
...
table_list->schema_table_name may be 0 in this case and 'strcasecmp' is
not necessary in this case.
2005-01-28 19:08:27 +03:00
dlenev@mysql.com
09b08edcc5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
2005-01-28 17:43:59 +03:00
serg@serg.mylan
6117ee754b
fixed automake problem in dbug/Makefile.am
2005-01-28 13:49:42 +01:00
marko@hundin.mysql.fi
70799de479
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-01-28 14:17:49 +02:00
marko@hundin.mysql.fi
2f63bccc66
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/marko/j/mysql-5.0
2005-01-28 14:01:02 +02:00
pekka@mysql.com
9182e52495
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/export/space/pekka/ndb/version/my50
2005-01-28 13:01:01 +01:00
tomas@poseidon.ndb.mysql.com
b313dee545
NdbScanFilter.hpp:
...
added docs
2005-01-28 13:01:00 +01:00
ram@gw.mysql.r18.ru
edba2b9b33
A fix (bug #6000 : No "@%"-accounts after install).
2005-01-28 15:26:17 +04:00
marko@hundin.mysql.fi
8342958665
InnoDB: Allow concurrent TRUNCATE and INSERT on a table. (Bug #8144 )
2005-01-28 12:18:33 +02:00
pekka@mysql.com
7e57e82a95
Merge mysql.com:/export/space/pekka/ndb/version/my41
...
into mysql.com:/export/space/pekka/ndb/version/my50
2005-01-28 10:56:37 +01:00
pekka@mysql.com
825d35b28a
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/export/space/pekka/ndb/version/my50
2005-01-28 10:52:54 +01:00
pekka@mysql.com
bcf1cb0f23
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/export/space/pekka/ndb/version/my41
2005-01-28 10:52:31 +01:00
pekka@mysql.com
0cbd4970bf
ndb - fix DATE printout
2005-01-28 10:51:30 +01:00
ram@gw.mysql.r18.ru
d177817cac
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6000
2005-01-28 12:27:46 +04:00
tomas@poseidon.ndb.mysql.com
d8f0e8f04e
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-28 09:16:02 +01:00
tomas@poseidon.ndb.mysql.com
e87bd60c12
NdbThread.c:
...
wrong order in c-file
2005-01-28 09:15:01 +01:00
dlenev@mysql.com
2276bfa374
Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. and
...
CONVERT_TZ() function does not work well together" and bug #7705
"CONVERT_TZ() crashes with subquery/WHERE on index column" in 5.0
tree.
2005-01-28 10:22:50 +03:00
dlenev@mysql.com
c80c503a1b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
2005-01-28 09:32:43 +03:00
tomas@poseidon.ndb.mysql.com
af12846505
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-28 02:07:13 +01:00
tomas@poseidon.ndb.mysql.com
3800cede90
Do-compile:
...
ndbcluster requires more ports, this is the reason why builds will not start on multiple builds
2005-01-28 02:06:27 +01:00
tomas@poseidon.ndb.mysql.com
2fbacc191b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-28 01:31:27 +01:00
tomas@poseidon.ndb.mysql.com
e8090fc224
Merge
2005-01-28 00:47:41 +01:00
tomas@poseidon.ndb.mysql.com
732d1a5e81
Bug#8167 signal usage clash between mysql server and ndb shared memory
...
added shared memory config parameter, signum for use in signalling
added global variable for holdign signum to be used for shared memory connection
only fiddle with signals if it is set
simplified common ndb client option handling
2005-01-28 00:42:41 +01:00
kent@mysql.com
499a441683
compile-solaris-sparc-purify:
...
Added preparation of mysql_client_test(_embedded) and mysqltest(_embedded)
Added --purify, --purecov, --quantify and --cxxfilt <cxxfiltprog> options
mysql-test-run.sh:
Report correctly combinations of embedded+ps-protocol etc
Added initial Purify support
2005-01-28 00:35:26 +01:00
konstantin@mysql.com
2b858ae682
Remove unused configure.in name TOOLS_LIBS.
2005-01-28 01:23:06 +03:00
reggie@bob.(none)
e9e4d936dc
Bug #5185 mysqldump for windows database gets table names with different case
...
Added the get_actual_table_name function that issues a SHOW TABLES LIKE '%s'. This will get the table
name in the proper case. We use this table name rather than the one given on the command line. This will
prevent problems when importing SQL on Linux that was generated on a Windows platform where case can be
an issue.
mysqldump.c:
call get_actual_table_name to get the table name in the proper case
2005-01-27 14:48:26 -06:00
pekka@mysql.com
e27c58b908
ndb - post-merge fix
2005-01-27 21:23:21 +01:00
heikki@hundin.mysql.fi
6979789732
fil0fil.c:
...
We accidentally checked if the DIRECTORY is of type OS_FILE_TYPE_UNKNOWN; our intention was to check if the FILE is that; best to remove the check altogether, as in crash recovery it is safest to try to open also files whose type is unknown
os0file.c:
Fix a bug: in Windows, os_file_readdir_next_file() returned OS_FILE_TYPE_UNKNOWN as the type of a regular file; this did not break mysqld, but did break ibbackup on Windows
2005-01-27 22:00:36 +02:00
heikki@hundin.mysql.fi
61a0e57cd0
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-27 21:33:15 +02:00
gluh@gluh.mysql.r18.ru
6d929b5955
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-27 21:32:24 +03:00
pekka@mysql.com
8480b22122
Merge
2005-01-27 18:41:23 +01:00
pekka@mysql.com
521f736737
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/export/space/pekka/ndb/version/my41
2005-01-27 18:12:04 +01:00
gluh@gluh.mysql.r18.ru
6afbb3d627
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-27 20:01:37 +03:00
heikki@hundin.mysql.fi
5014402000
os0file.c:
...
Add includes for the _stat() call to compile on Windows in Hot Backup build
2005-01-27 18:54:00 +02:00
heikki@hundin.mysql.fi
a4908dbcd1
ut0mem.c:
...
Add a note to the error message that is printed when memory allocation fails: 32-bit computers usually have at most 2 GB or 4 GB process memory space
2005-01-27 18:53:59 +02:00
gluh@gluh.mysql.r18.ru
cab93758f1
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
2005-01-27 19:53:58 +03:00
pekka@mysql.com
5cbadf4358
ndb - make YEAR and TIMESTAMP into ndb types
2005-01-27 17:33:35 +01:00
gluh@gluh.mysql.r18.ru
9cb334f490
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
2005-01-27 18:23:05 +03:00
marko@hundin.mysql.fi
4a2aef45ce
configure.in:
...
Add -DDBUG_ON to CXXFLAGS whenever it is added to CFLAGS.
Thus, sql/ha_innodb.cc will be compiled with the same
setting of UNIV_DEBUG as the rest of InnoDB,
i.e., --with-debug enables InnoDB ut_ad() assertions
everywhere.
2005-01-27 17:12:21 +02:00
lenz@mysql.com
8c6f24f6b0
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-01-27 15:12:33 +01:00
marko@hundin.mysql.fi
4117949ace
InnoDB: Tolerate negative return values from ftell().
2005-01-27 14:05:44 +02:00
ingo@mysql.com
48488e483a
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-27 12:18:02 +01:00
ingo@mysql.com
42531336f0
Re-enabled the use of --prefix.
...
Adjusted the "Usage:" string.
Ordered the option recognition in reverse order from "Usage:".
2005-01-27 12:13:35 +01:00
ingo@mysql.com
896d3a5f05
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-27 12:10:15 +01:00
ram@gw.mysql.r18.ru
170fb5329b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-27 15:10:06 +04:00
ingo@mysql.com
fd352fd00e
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-27 12:01:19 +01:00
bar@mysql.com
858171cb6f
item_timefunc.cc:
...
CAST now always return a well-formed character string.
2005-01-27 14:51:16 +04:00
ram@gw.mysql.r18.ru
7fda26d7fb
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-27 14:16:54 +04:00