Commit graph

18186 commits

Author SHA1 Message Date
unknown
c0e6e87926 Updates for Monty's changes in the table structure. All tests pass currently.
Seems like such a short commit message...


sql/examples/ha_archive.cc:
  Updates for Monty's change to table structures.
  The way the loop through blobs worked has changed.
sql/examples/ha_tina.cc:
  Update for monty's change in table structures. 
  Only used for copying null bytes.
2005-01-06 18:34:17 -08:00
unknown
fb0f6c9de1 Fix for compiling error in sql_parse
sql/sql_parse.cc:
  Fixing merge issue with goto label missing.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-06 16:31:18 -08:00
unknown
ae7cfe9ee8 Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
into mysql.com:/home/jwinstead2/mysql-5.0


client/mysqladmin.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_pthread.h:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
2005-01-06 21:39:57 +01:00
unknown
e50bfebe99 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
unknown
7826587dbe 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
unknown
3770d90689 main.cpp:
correcting 4.1 merge error


ndb/src/mgmsrv/main.cpp:
  correcting 4.1 merge error
2005-01-06 21:01:32 +01:00
unknown
c9da387e5f Merge mysql.com:/home/jwinstead2/mysql-4.1-7021
into mysql.com:/home/jwinstead2/mysql-4.1-clean


scripts/mysql_config.sh:
  Auto merged
2005-01-06 20:03:06 +01:00
unknown
7261f3c016 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
unknown
eb6f4f85f0 Add comment to make code for option-stripping in mysql_config more clear
scripts/mysql_config.sh:
  Add comment to clarify why we can safely only strip flags with a leading space
2005-01-06 19:57:02 +01:00
unknown
d3faf620ac 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
unknown
babb77767a postreview changes
client/mysqldump.c:
  fixed comment
  fixed compiler warning
2005-01-06 20:47:08 +02:00
unknown
382cc831de merged
BitKeeper/etc/ignore:
  auto-union
include/my_pthread.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  merged manually
2005-01-06 19:32:16 +02:00
unknown
928c20f8e3 fixed comparation with string constant on some platform (BUG#7651)
client/mysqldump.c:
  fixed comparation with string constant on some platform
2005-01-06 19:13:58 +02:00
unknown
299d0a8775 Merge mysql.com:/home/jwinstead2/mysql-4.1-7451
into mysql.com:/home/jwinstead2/mysql-4.1-clean


client/mysqladmin.cc:
  Auto merged
2005-01-06 17:27:48 +01:00
unknown
9a8c1ee351 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
unknown
63abeac74a 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
unknown
6b584127af 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
unknown
d5ad4615fb Merge 2005-01-06 16:50:34 +01:00
unknown
4532a89f0d 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
unknown
574a2820cf 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
unknown
5360632639 removed unused label 2005-01-06 17:08:38 +02:00
unknown
e750ce2613 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/sql_prepare.cc:
  Auto merged
2005-01-06 17:00:59 +02:00
unknown
615cd4ff75 Fixed a bug in prepared statements error handling
After merge fixes


libmysql/libmysql.c:
  Fixed a bug in prepared statements error handling introduced by me on a recent patch
mysql-test/r/delayed.result:
  Updated results
mysql-test/t/delayed.test:
  Bigger timeout needed when using --ps-protocol (don't understand why yet)
  Added output of not_flushed_dealyed_rows for easier debugging
sql/sql_base.cc:
  USE tables_share fix for prepared statements
sql/sql_prepare.cc:
  After merge fix
2005-01-06 16:59:29 +02:00
unknown
f40d29a232 - Manually merged two changes from 4.0
BUILD/compile-dist:
  - manual merge
include/my_pthread.h:
  - manual merge
2005-01-06 15:32:42 +01:00
unknown
7344af9cbc 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
unknown
10844e41da - enable "with-extra-charsets=complex" for the "compile-dist" distribution
build (to make the test suite pass)


BUILD/compile-dist:
  - enable "with-extra-charsets=complex" for the distribution build
    (to make the test suite pass)
2005-01-06 14:35:14 +01:00
unknown
744ceabebe ha_ndbcluster.m4:
fixed ndb configure according to 4.1


config/ac-macros/ha_ndbcluster.m4:
  fixed ndb configure according to 4.1
2005-01-06 13:04:52 +01:00
unknown
8ff8867251 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
2005-01-06 13:31:31 +02: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
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
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
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
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