Commit graph

18418 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
f105070eff added classification "schema object already exists" 2005-01-07 10:48:13 +01:00
tomas@poseidon.ndb.mysql.com
4e4dffb4e3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-07 08:40:55 +01:00
joreland@mysql.com
013f9bbfb5 merge 2005-01-07 07:15:08 +01:00
joreland@mysql.com
f3baf38dbc merge 2005-01-07 06:47:41 +01:00
brian@zim.(none)
3be57f961b This just fixes the compile issues for table structure changes.
The test case does not currently work (I am comitting this so that Patrick will have a working copy).
I am going to look at the test case next. It is suspected that it is failing do to a change in mysql_test_run.
2005-01-06 19:37:16 -08:00
brian@zim.(none)
2ee9d854b4 Updates for Monty's changes in the table structure. All tests pass currently.
Seems like such a short commit message...
2005-01-06 18:34:17 -08:00
brian@zim.(none)
75f282df27 Fix for compiling error in sql_parse 2005-01-06 16:31:18 -08:00
jimw@mysql.com
5010be1d8b Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-06 21:39:57 +01:00
jimw@mysql.com
03578cd6bf Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 21:26:07 +01:00
tomas@poseidon.ndb.mysql.com
e9a43dda06 updated event example to make use of new NdbError member in NdbEventOperation
added my_pthread_init to get dbug print correct in Hugo
    added define for event error code
2005-01-06 21:13:04 +01:00
tulin@build.mysql.com
5157743357 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.0
2005-01-06 21:03:09 +01:00
tulin@build.mysql.com
b8a1b9a438 main.cpp:
correcting 4.1 merge error
2005-01-06 21:01:32 +01:00
jimw@mysql.com
488170d38c Merge mysql.com:/home/jwinstead2/mysql-4.1-7021
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 20:03:06 +01:00
jimw@mysql.com
4149e1116a Merge mysql.com:/home/jwinstead2/mysql-4.1-6964
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 20:01:18 +01:00
jimw@mysql.com
2acb738784 Add comment to make code for option-stripping in mysql_config more clear 2005-01-06 19:57:02 +01:00
bell@sanja.is.com.ua
a8861fe9ec Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2005-01-06 20:49:27 +02:00
bell@sanja.is.com.ua
d944dc9a78 postreview changes 2005-01-06 20:47:08 +02:00
serg@sergbook.mysql.com
f472cec178 merged 2005-01-06 19:32:16 +02:00
bell@sanja.is.com.ua
779c33a5e7 fixed comparation with string constant on some platform (BUG#7651) 2005-01-06 19:13:58 +02:00
jimw@mysql.com
d4b236fe8f Merge mysql.com:/home/jwinstead2/mysql-4.1-7451
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 17:27:48 +01:00
jimw@mysql.com
e3abb95228 Merge mysql.com:/home/jwinstead2/mysql-4.1-7249
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 17:24:47 +01:00
jimw@mysql.com
dee59e57fe Merge mysql.com:/home/jwinstead2/mysql-4.1-7524
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 17:23:52 +01:00
serg@sergbook.mysql.com
15133e70ac Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-01-06 17:53:32 +02:00
jimw@mysql.com
7d568454fe Merge 2005-01-06 16:50:34 +01:00
serg@sergbook.mysql.com
03f64a6343 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-06 17:40:00 +02:00
lenz@mysql.com
df323c0c4b Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-06 16:37:08 +01:00
bell@sanja.is.com.ua
421738e8ce removed unused label 2005-01-06 17:08:38 +02:00
monty@mysql.com
0035397cb8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-01-06 17:00:59 +02:00
monty@mysql.com
ef74d8d898 Fixed a bug in prepared statements error handling
After merge fixes
2005-01-06 16:59:29 +02:00
lenz@mysql.com
6b6a11f85b - Manually merged two changes from 4.0 2005-01-06 15:32:42 +01:00
joreland@mysql.com
9d19b96ade Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-06 15:18:03 +01:00
joerg@mysql.com
7f73e8b81b Ensure that a 'bool' function really returns a value - was compiler error on some problems causing build failure. 2005-01-06 15:09:33 +01:00
lenz@mysql.com
57099ef6c6 - enable "with-extra-charsets=complex" for the "compile-dist" distribution
build (to make the test suite pass)
2005-01-06 14:35:14 +01:00
joreland@mysql.com
6e7bc6b643 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-06 14:32:00 +01:00
tulin@build.mysql.com
9b122af3e1 ha_ndbcluster.m4:
fixed ndb configure according to 4.1
2005-01-06 13:04:52 +01:00
tomas@poseidon.ndb.mysql.com
a42aa975a6 NdbRecAttr.cpp:
forgot hex prefix
2005-01-06 13:03:37 +01:00
tomas@poseidon.ndb.mysql.com
1f4c79ecdf NdbRecAttr.cpp:
improved printout routine
2005-01-06 13:02:06 +01:00
monty@mysql.com
bda0a78184 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-01-06 13:31:31 +02:00
tomas@poseidon.ndb.mysql.com
92079efccd improved print routine for NdbRecAttr 2005-01-06 12:10:49 +01:00
monty@mysql.com
d35140a851 First stage of table definition cache
Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
Created Field::make_field() and made Field_num::make_field() to call this
Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
Renamed TABLE_SHARE->real_name to table_name
Renamed TABLE->table_name to alias
Renamed TABLE_LIST->real_name to table_name
2005-01-06 13:00:13 +02:00
heikki@hundin.mysql.fi
746fd9fdac os0file.c:
Use the fcntl() file flush method on OS X; Apple disabled fsync() for internal disk drives, which caused corruption in power outages; the patch was recommended by an Apple engineer
2005-01-06 11:19:20 +02:00
jimw@mysql.com
9971b2f0f5 Add support for --default-character-set to mysqladmin (Bug #7524) 2005-01-06 01:08:03 +01:00
jimw@mysql.com
4d025523e5 Fix "mysqladmin password" to use correct password scrambling function when
talking to pre-4.1 servers or 4.1 and later servers where the old_passwords
option is enabled. "mysqladmin old-password" is unchanged. (Bug #7451)
2005-01-05 21:56:18 +01:00
joreland@mysql.com
738cb6ab81 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-05 21:22:39 +01:00
joreland@mysql.com
c39db2febf Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-05 21:22:38 +01:00
tomas@poseidon.ndb.mysql.com
45738d53ea ndbapi event code cleanup
+ some more docs on event
2005-01-05 21:22:37 +01:00
tomas@poseidon.ndb.mysql.com
fa5127e2ff last go at enabling using const NdbDictionary didn't work
+ some docs update on events
2005-01-05 19:59:45 +01:00
jimw@mysql.com
a3f184f532 Merge 2005-01-05 19:22:58 +01:00
jimw@mysql.com
c1593ecf66 Allow DEFAULT_THREAD_STACK to be set via -DDEFAULT_THREAD_STACK=... so our
official binary builds for Linux that are built against a static glibc with
a 128k thread stack size limit can be compiled with a default that doesn't
result in a harmless (but oft-misunderstood) warning message. (Bug #6226)
2005-01-05 19:02:17 +01:00
tomas@poseidon.ndb.mysql.com
79fb236b0a changed to using NdbTransaction scoped enums
and removed usage of Ndb::waitUntilReady()
2005-01-05 17:59:24 +01:00