mskold/marty@linux.site
7993c76c10
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-21 16:30:07 +01:00
msvensson@neptunus.(none)
7e7a0e95d3
Improve ndb thread shutdown handling
2006-12-20 22:57:23 +01:00
mskold/marty@mysql.com/linux.site
f55af1eade
ndb_dd_ddl.test, ndb_dd_ddl.result, ha_ndbcluster.cc:
...
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: disallowed TABLESPACE declaration for STORAGE MEMORY
Makefile:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile -> storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
mgmapi_logevent2.cpp:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp
Makefile:
Rename mgmapi_logevent_dual to mgmapi_logevent2
mgmapi_logevent2.cpp:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp
2006-12-20 15:15:26 +01:00
mskold/marty@mysql.com/linux.site
3587ee8e4e
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: ALTER TABLE must specify STORAGE explicitely to change it, + post review changes
2006-12-19 23:20:43 +01:00
mskold/marty@mysql.com/linux.site
dab48d5df2
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: copy tablespace from old table in copying alter table
2006-12-19 15:53:46 +01:00
monty@mysql.com/narttu.mysql.fi
9d3fda77c8
After merge fixes:
...
- Remove compiler warnings
- Fix merge errors
- Indentation fixes
2006-12-15 06:21:15 +02:00
monty@mysql.com/narttu.mysql.fi
a6481aa4c7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-12-15 01:01:52 +02:00
monty@mysql.com/narttu.mysql.fi
88dd873de0
Fixed compiler warnings detected by option -Wshadow and -Wunused:
...
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments
Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c
I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
2006-12-15 00:51:37 +02:00
mskold/marty@mysql.com/linux.site
856b919986
bug#19956 Problems with VARCHAR primary key and BLOB fields:put back removed error handling for HA_ERR_KEY_NOT_FOUND
2006-12-14 16:52:50 +01:00
mskold/marty@mysql.com/linux.site
8d8d063f91
Removed check for impossible error return
2006-12-14 16:27:14 +01:00
msvensson@neptunus.(none)
971c783f7d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-04 19:11:55 +01:00
msvensson@neptunus.(none)
6072b7a4c4
Merge bk-internal:/home/bk/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-12-04 18:44:14 +01:00
mskold/marty@mysql.com/linux.site
6e8f99d29b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-12-04 15:09:47 +01:00
mskold/marty@linux.site
93b7491421
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-01 16:37:13 +01:00
mskold/marty@mysql.com/linux.site
cde79e4f79
Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema
2006-12-01 15:49:07 +01:00
gni/root@ts3-168.ts.cn.tlan
24b1feea03
Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
2006-12-01 11:35:05 +08:00
mskold/marty@mysql.com/linux.site
2311316962
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-11-30 23:12:33 +01:00
mskold/marty@mysql.com/linux.site
4b7e0b5fd9
bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated
2006-11-30 23:10:11 +01:00
mskold/marty@mysql.com/linux.site
aa03fbcac9
bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated
2006-11-30 22:52:23 +01:00
monty@mysql.com/narttu.mysql.fi
601e6f4b2a
Fixed compiler warnings
...
Don't assert if my_thread_end() is called twice (common case)
2006-11-30 21:56:03 +02:00
mskold/marty@linux.site
7ef5479520
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-11-30 17:28:08 +01:00
mskold/marty@linux.site
a6f311750f
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-11-30 17:23:54 +01:00
mskold/marty@mysql.com/linux.site
e71c09b482
bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: handle INSERT ... ON DUPLICATE KEY UPDATE
2006-11-30 17:22:04 +01:00
mskold/marty@mysql.com/linux.site
a172df24a9
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-11-30 16:04:12 +01:00
mskold/marty@mysql.com/linux.site
d4a929d741
bug#24303 Wrong result for UPDATE IGNORE for NDB table: bug fix reverted, fix for bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key, solves it a better way
2006-11-30 15:44:30 +01:00
mskold/marty@linux.site
d7e375680a
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-11-30 15:31:20 +01:00
mskold/marty@linux.site
2a4de6fc84
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-11-30 15:05:09 +01:00
mskold/marty@mysql.com/linux.site
af324d9cf0
#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: call peek_index_rows
2006-11-30 15:02:33 +01:00
msvensson@shellback.(none)
7ddc43e305
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-29 15:44:09 +01:00
mskold/marty@mysql.com/linux.site
7d86df6af1
bug#24303 Wrong result for UPDATE IGNORE for NDB table: Refinement, only read all fields for UPDATE IGNORE with pk (check if UPDATE command and pk in write_set)
2006-11-29 15:33:11 +01:00
mskold/marty@mysql.com/linux.site
cf58d3a136
bug#24303 Wrong result for UPDATE IGNORE for NDB table: Read all fields for UPDATE IGNORE with pk
2006-11-29 13:23:19 +01:00
msvensson@neptunus.(none)
e135cbde89
Merge bk-internal:/home/bk/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-11-28 16:54:49 +01:00
msvensson@neptunus.(none)
a45b64b134
Move misplaced #endif
2006-11-27 14:02:14 +01:00
monty@mysql.com/nosik.monty.fi
fa81a82e7f
Fixed a LOT of compiler warnings
...
Added missing DBUG_RETURN statements (in mysqldump.c)
Added missing enums
Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes
Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.
2006-11-27 01:47:38 +02:00
monty@nosik.monty.fi
89570bf966
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2006-11-22 14:11:36 +02:00
msvensson@neptunus.(none)
736c5b796c
No need for ndb_util_thread to have two different ndb objects allocated. Use the thd_ndb one and remove the other one.
2006-11-21 13:58:26 +01:00
msvensson@neptunus.(none)
c268ce60e4
Fix printf warnings
...
Improve dbug_print_open_tables so the trace files are readable.
2006-11-21 00:23:38 +01:00
monty@mysql.com/nosik.monty.fi
e825879800
Remove compiler warnings
...
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
2006-11-20 22:42:06 +02:00
Justin.He/justin.he@dev3-47.dev.cn.tlan
23ae8206f5
BUG#23576, Table is created although tablespace does not exist
2006-11-15 13:43:02 +08:00
mskold/marty@mysql.com/linux.site
4acc1af12c
bug#21507 I can't create a unique hash index in NDB: Added possibillity to create hash only indexes with NULL valued attributes, but any NULL valued access will become full table scan with pushed condition on index attribute values. 5.1 re-implementation
2006-11-13 12:56:45 +01:00
mskold/marty@linux.site
6ad1b4f92c
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-11-10 11:38:54 +01:00
mskold/marty@mysql.com/linux.site
b7cc16c7cc
bug#23542 crash on DELETE from ndb dd table: uses_blob_value always reads write_set, should check read_set if read operation
2006-11-08 15:09:35 +01:00
mskold/marty@mysql.com/linux.site
f293350725
bug#21507 I can't create a unique hash index in NDB: Added possibillity to create hash only indexes with NULL valued attributes, but any NULL valued access will become full table scan with pushed condition on index attribute values
2006-11-07 16:38:37 +01:00
monty@nosik.monty.fi
d745fe49fe
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-11-01 19:46:23 +02:00
monty@mysql.com/nosik.monty.fi
ca99516cc7
Fixed a lot of compiler warnings (Mainly in mysqld and instance manager)
...
Fixed some possible fatal wrong arguments to printf() style functions
Initialized some not initialized variables
Fixed bug in stored procedure and continue handlers
(Fixes Bug#22150)
2006-11-01 19:41:09 +02:00
dli@dev3-76.dev.cn.tlan
11c07c8df4
ndb - BUG#18647, cluster.schema database needs to be hidden.
...
Hide cluster.schema table when executing 'show tables' on mysql client.
2006-11-01 11:04:26 +08:00
stewart@willster.(none)
1f05ac4ac3
post merge fixes (from merging test fixes from bug 19914)
2006-10-25 20:37:10 +10:00
stewart@willster.(none)
d5810cd067
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
2006-10-25 18:41:17 +10:00
jonas@perch.ndb.mysql.com
5230dcebcc
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-25 08:45:06 +02:00
jonas@perch.ndb.mysql.com
6e4a0ec042
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-10-25 08:28:30 +02:00