Commit graph

18582 commits

Author SHA1 Message Date
unknown
22c23f2247 improved print routine for NdbRecAttr 2005-01-06 12:10:49 +01:00
unknown
acf76e3b88 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


include/myisam.h:
  Added const before names
mysql-test/r/group_min_max.result:
  Make results repeatable
mysql-test/t/group_min_max.test:
  Make results repeatable
sql/field.cc:
  Created Field::make_field() and made Field_num::make_field() to call this
  Use TABLE_SHARE
  Use sql_strmake() instead of sql_memdup() to simplify code
sql/field.h:
  Changed table_name to be pointer to table_name. This allows us to change alias for all fields by just changing one pointer.
  Use TABLE_SHARE
sql/field_conv.cc:
  Use TABLE_SHARE
sql/filesort.cc:
  Use TABLE_SHARE
sql/ha_berkeley.cc:
  Use TABLE_SHARE
sql/ha_heap.cc:
  Use TABLE_SHARE
sql/ha_innodb.cc:
  Use TABLE_SHARE
sql/ha_myisam.cc:
  Use TABLE_SHARE
sql/ha_myisammrg.cc:
  Use TABLE_SHARE
  Change some pointer handling to use const char*
sql/ha_ndbcluster.cc:
  Use TABLE_SHARE
sql/handler.cc:
  Use TABLE_SHARE
sql/item.cc:
  Use TABLE_SHARE
sql/item_func.cc:
  Use TABLE_SHARE
sql/item_subselect.cc:
  Use TABLE_SHARE
sql/item_sum.cc:
  Use TABLE_SHARE
sql/key.cc:
  Use TABLE_SHARE
sql/lock.cc:
  Use TABLE_SHARE
sql/log_event.cc:
  real_name -> table_name
sql/mysql_priv.h:
  Use TABLE_SHARE
sql/opt_range.cc:
  Use TABLE_SHARE
sql/opt_sum.cc:
  Use TABLE_SHARE
sql/records.cc:
  Use TABLE_SHARE
sql/repl_failsafe.cc:
  real_name -> table_name
sql/slave.cc:
  Use TABLE_SHARE
sql/sp.cc:
  Use TABLE_SHARE
sql/sp_head.cc:
  real_name -> table_name
sql/sql_acl.cc:
  Use TABLE_SHARE
  removed unnecessary assert
  fixed indentation
  changed some char * -> const char*
sql/sql_acl.h:
  changed some char* -> const char*
sql/sql_base.cc:
  Use TABLE_SHARE
sql/sql_cache.cc:
  Use TABLE_SHARE
sql/sql_class.cc:
  Use TABLE_SHARE
sql/sql_db.cc:
  real_name -> table_name
sql/sql_delete.cc:
  Use TABLE_SHARE
sql/sql_derived.cc:
  Use TABLE_SHARE
sql/sql_handler.cc:
  Use TABLE_SHARE
sql/sql_help.cc:
  Use TABLE_SHARE
sql/sql_insert.cc:
  Use TABLE_SHARE
sql/sql_load.cc:
  Use TABLE_SHARE
sql/sql_parse.cc:
  Use TABLE_SHARE
sql/sql_rename.cc:
  real_name -> table_name
sql/sql_select.cc:
  Use TABLE_SHARE
  table->blob_fields now points to field offsets, not fields
  tmp_table->table_name now points to alias name
sql/sql_show.cc:
  Use TABLE_SHARE
sql/sql_table.cc:
  Use TABLE_SHARE
sql/sql_test.cc:
  Use TABLE_SHARE
sql/sql_trigger.cc:
  Use TABLE_SHARE
sql/sql_udf.cc:
  Use TABLE_SHARE
sql/sql_union.cc:
  real_name -> table_name
sql/sql_update.cc:
  Use TABLE_SHARE
sql/sql_view.cc:
  Use TABLE_SHARE
sql/table.cc:
  Split TABLE to TABLE and TABLE_SHARE
  Changed blob_field to be field offsets instead of pointer to fields
  Only initialize table->s->default_values with default record (not all table->record[#])
  Some indentation changes
sql/table.h:
  Split TABLE to TABLE and TABLE_SHARE
sql/tztime.cc:
  real_name -> table_name
sql/unireg.cc:
  Use TABLE_SHARE
sql/unireg.h:
  Use TABLE_SHARE
2005-01-06 13:00:13 +02:00
unknown
51cae387a9 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


innobase/os/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
unknown
0f00947b5d Add support for --default-character-set to mysqladmin (Bug #7524)
client/mysqladmin.cc:
  Handle default-character-set being specified
2005-01-06 01:08:03 +01:00
unknown
190f7a6f45 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)


client/mysqladmin.cc:
  Check old_passwords from server, and use that to determine
  which scramble function to use (except in the case of the
  old-password command, which always use the old scramble function).
2005-01-05 21:56:18 +01:00
unknown
70a4cf9d47 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
unknown
49206d2d16 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.cc:
  Auto merged
2005-01-05 21:22:38 +01:00
unknown
97682b76d2 ndbapi event code cleanup
+ some more docs on event


ndb/examples/ndbapi_event_example/ndbapi_event.cpp:
  ndbapi event code cleanup
ndb/include/kernel/signaldata/CreateEvnt.hpp:
  ndbapi event code cleanup
ndb/include/ndbapi/NdbDictionary.hpp:
  ndbapi event code cleanup
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  ndbapi event code cleanup
ndb/src/ndbapi/ndberror.c:
  ndbapi event code cleanup
2005-01-05 21:22:37 +01:00
unknown
41b5876edb last go at enabling using const NdbDictionary didn't work
+ some docs update on events


ndb/examples/ndbapi_simple_example/ndbapi_simple.cpp:
  updated example somewhat
ndb/include/ndbapi/NdbDictionary.hpp:
  fixed some docs
ndb/src/ndbapi/NdbDictionary.cpp:
  last go at enabling using const NdbDictionary didn't work
ndb/tools/desc.cpp:
  last go at enabling using const NdbDictionary didn't work
ndb/tools/listTables.cpp:
  last go at enabling using const NdbDictionary didn't work
2005-01-05 19:59:45 +01:00
unknown
d9adebfa24 Merge
include/my_pthread.h:
  fix merge conflict
2005-01-05 19:22:58 +01:00
unknown
3edb7774ed 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)


include/my_pthread.h:
  Allow DEFAULT_THREAD_STACK to be set via -DDEFAULT_THREAD_STACK=...
2005-01-05 19:02:17 +01:00
unknown
3add897ef9 changed to using NdbTransaction scoped enums
and removed usage of Ndb::waitUntilReady()
2005-01-05 17:59:24 +01:00
unknown
9bb865befc Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-05 17:57:55 +01:00
unknown
73207038f1 added correct res initialisation
and check of handler compatibility
2005-01-05 17:42:22 +02:00
unknown
6f2f0d5cf3 my_sleep.c:
On Windows my_sleep() always gave a zero microsecond sleep


mysys/my_sleep.c:
  On Windows my_sleep() always gave a zero microsecond sleep
2005-01-05 16:35:43 +01:00
unknown
7e5d7b84b0 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2005-01-05 16:51:29 +02:00
unknown
47dc78e6a3 fixed views with PS protocol
mysql-test/r/view.result:
  query cache part moved to separate test
mysql-test/t/view.test:
  query cache part moved to separate test
sql/item_func.cc:
  fixed for safety
sql/sql_base.cc:
  do not use real table call with view
  fixed wrapping * substitured items
  fixed fix_fields call parameter (refference)
sql/sql_yacc.yy:
  added initialisation of SELECT in commands which can use subqueries
sql/table.cc:
  fised fix_fields call parameter
sql/table.h:
  new view specific method
2005-01-05 16:48:23 +02:00
unknown
ae736acfc3 ndb - getTable retry if DICT busy
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  getTable retry if DICT busy
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-05 13:37:34 +01:00
unknown
1d6a4a54c7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-05 14:14:30 +02:00
unknown
c99b4964ca replace position names and testes
fixed bug
2005-01-05 17:14:29 +05:00
unknown
ad77b4cbfd Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
2005-01-05 14:11:26 +02:00
unknown
af4ef15f82 mysql-test/mysql-test-run.sh
report test mode if case of failure (default/ps-protocol/embedded)


mysql-test/mysql-test-run.sh:
  report test mode if case of failure (default/ps-protocol/embedded)
2005-01-05 14:09:31 +02:00
unknown
d889e399a3 Merge
mysql-test/mysql_test_run_new.c:
  SCCS merged
2005-01-05 16:31:20 +05:00
unknown
8a1e77e23f WL#964
_stricmp was replaved on sting_compare_func
added breakes for windows


mysql-test/mysql_test_run_new.c:
  _stricmp was replaved on sting_compare_func
  added breakes for windows
2005-01-05 16:26:53 +05:00
unknown
0f8b518bee InnoDB: Fix compiler warnings and some bad formatting introduced
in ChangeSet@1.1721.48.1


innobase/include/ut0ut.h:
  Add prototype for ut_usectime()
innobase/srv/srv0srv.c:
  Fix some misformatted code.
  Remove a compiler warning about possibly uninitialized variable
  in srv_suspend_mysql_thread().
innobase/sync/sync0sync.c:
  Remove a compiler warning about possibly uninitialized variable
  in mutex_spin_wait().
innobase/ut/ut0ut.c:
  Improve the documentation and formatting of ut_usectime().
2005-01-05 12:22:04 +02:00
unknown
509554c3cd InnoDB: fix corruption in crash recovery of BLOB fields (Bug #7679)
innobase/mtr/mtr0log.c:
  mlog_open_and_write_index(): BLOBs should have maximum length > 255
2005-01-05 11:56:41 +02:00
unknown
9368cd0f3f fix alignment issues 2005-01-05 11:56:15 +02:00
unknown
0e29e5e715 moved AbortOption and ExecType inside NdbTransaction
and provided some backwards compat functions
2005-01-05 04:13:46 +01:00
unknown
329a6e9c22 Protect flags like -Wl,-O2 from being mangled by mysql_config (Bug #6964)
(Second commit of this patch -- first included wrong changes.)


scripts/mysql_config.sh:
  Make sure we are only removing whole options (protects -Wl,-O2, for example)
2005-01-05 03:43:37 +01:00
unknown
f89207c2e6 Make sure to include ZLIB_LIBS in mysql_config --libs_r (Bug #7021)
scripts/mysql_config.sh:
  include ZLIB_LIBS in --libs_r
2005-01-05 02:04:12 +01:00
unknown
4fd1524c0a reverting the change that results in infinite recursion 2005-01-05 02:19:04 +02:00
unknown
4ea09b797e Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-05 01:17:31 +01:00
unknown
1dc5312b9c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-01-05 02:15:04 +02:00
unknown
284780167d Change mysqld_safe search for mysqld relative to the current working directory
to only look for the mysqld binary (and english error strings) and assume the
datadir from that. Then, if that datadir turns out to not exist, startup will
fail. This avoids the behavior where mysqld_safe would go off and run a totally
different binary because the data directory had been moved (even when --datadir
was specified on the command line). (Bug #7249)


scripts/mysqld_safe.sh:
  Don't actually verify that datadir exists when
  using relatively-located mysqld -- just assume
  that it does and either let it fail when it
  doesn't, or do the right thing when datadir
  is then set via the command line or my.cnf file.
2005-01-05 01:08:45 +01:00
unknown
a1c9474d41 federated: compilation errors and crash fixed. test still fails. 2005-01-05 00:39:13 +02:00
unknown
b2dcf8f488 mysql_test_run_new.dsp:
Link mysql_test_run_new as console application
my_manage.c:
  The type intptr_t isn't defined for VC 6.0
  Changed return type for CreateProcess() to bool
mysql_test_run_new.c:
  The type intptr_t isn't defined for VC 6.0
mysqltest.dsp:
  Added regex to additional build types for mysqltest
mysqldump.dsp:
  Added mysys.lib for linking mysqldump


VC++Files/client/mysqldump.dsp:
  Added mysys.lib for linking mysqldump
VC++Files/client/mysqltest.dsp:
  Added regex to additional build types for mysqltest
mysql-test/mysql_test_run_new.c:
  The type intptr_t isn't defined for VC 6.0
mysql-test/my_manage.c:
  The type intptr_t isn't defined for VC 6.0
  Changed return type for CreateProcess() to bool
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Link mysql_test_run_new as console application
2005-01-04 23:07:29 +01:00
unknown
5499b0c5e1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-01-04 22:01:23 +01:00
unknown
b6e3943466 merge failure 2005-01-04 20:39:07 +01:00
unknown
aae10cd184 changed documented method from get/setDistributionKey to get/setPartitionKey
+ some extra docs on the area
updated docs by removing som async stuff


ndb/include/ndbapi/NdbTransaction.hpp:
  mostly reformatting but also some more explicit references to objects and methods
2005-01-04 19:51:59 +01:00
unknown
58d17d0155 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-01-04 20:44:08 +02:00
unknown
54cbfead74 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-04 19:22:50 +01:00
unknown
b7322badde Added checking for my.cnf file from environment variable MYSQL_HOME
instead of DATADIR.


include/config-win.h:
  Added checks for environment variable MYSQL_HOME
libmysql/Makefile.shared:
  Added checks for environment variable MYSQL_HOME
mysys/Makefile.am:
  Added checks for environment variable MYSQL_HOME
mysys/default.c:
  Removed checks for my.cnf file in datadir, instead added checking
  if my.cnf exists in environment variable MYSQL_HOME
scripts/mysqld_multi.sh:
  Added checks for my.cnf file in environment variable MYSQL_HOME,
  if exists.
scripts/mysqld_safe.sh:
  Added checks for my.cnf file in environment variable MYSQL_HOME,
  if exists.
2005-01-04 20:13:47 +02:00
unknown
1e802e105e Merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
ndb/include/Makefile.am:
  Auto merged
ndb/include/ndb_global.h.in:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged
2005-01-04 19:12:01 +01:00
unknown
b064b14761 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0


sql/sql_parse.cc:
  Auto merged
2005-01-04 19:00:22 +01:00
unknown
f6dd8094f0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-04 18:56:55 +01:00
unknown
7379ce22c0 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-01-04 18:05:42 +01:00
unknown
55ace5fd44 Merge mysql.com:/home/jwinstead2/mysql-4.1-5875
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-04 17:40:43 +01:00
unknown
e983f20445 Merge mysql.com:/home/jwinstead2/mysql-4.1-5878
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-04 17:37:14 +01:00
unknown
14e2c810db Merge
sql/set_var.cc:
  merge
2005-01-04 17:36:16 +01:00
unknown
54d86c8736 client.c:
Make multi-statements the preferred option name (to coincide
  with the renaming of the CLIENT_MULTI_RESULTS symbol to
  CLIENT_MULTI_STATEMENTS). Continue to allow multi-queries
  for backward compatibility.


sql-common/client.c:
  Make multi-statements the preferred option name (to coincide
  with the renaming of the CLIENT_MULTI_RESULTS symbol to
  CLIENT_MULTI_STATEMENTS). Continue to allow multi-queries
  for backward compatibility.
2005-01-04 10:32:42 -06:00