Commit graph

25782 commits

Author SHA1 Message Date
unknown
8699f77c08 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  selena.:H:/MYSQL/src/#11815-mysql-5.0
2005-08-31 18:44:02 +04:00
unknown
ec0f18c28f Fix group_min_max.test - myisam may return slightly row count estimate on amd64 2005-08-31 13:23:24 +04:00
unknown
c00dd12c28 Merge mysql.com:/usr/home/ram/work/4.1.b9613
into  mysql.com:/usr/home/ram/work/mysql-5.0


sql/ha_blackhole.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/variables.result:
  merging
mysql-test/t/variables.test:
  merging
2005-08-31 10:25:00 +05:00
unknown
44327dc468 configure.in:
Changed back to 5.0.13-beta


configure.in:
  Changed back to 5.0.13-beta
2005-08-31 03:45:04 +02:00
unknown
d6f7c45cf3 mysql-test-run.pl:
Put back unused old manager dummy arguments, some scripts use them


mysql-test/mysql-test-run.pl:
  Put back unused old manager dummy arguments, some scripts use them
2005-08-31 03:38:33 +02:00
unknown
f80b963828 Makefile.am:
Make dist copy of .imtest files not fail the make target, as there are no files yet


mysql-test/Makefile.am:
  Make dist copy of .imtest files not fail the make target, as there are no files yet
2005-08-31 02:25:28 +02:00
unknown
366b205801 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/12489-bug-5.0-mysql
2005-08-31 01:07:19 +04:00
unknown
0ccb16d636 Fix bug wrongly printed strcmp() function results in creation of broken
view.

For Item_func_strcmp print() was not defined and for this class was called
print_op of it's parent class. Because of this strcmp() was printed wrongly
and this results int creation of broken view.

Added function Item_func_strcmp::print() which correctly prints strcmp()
function.


sql/item_cmpfunc.h:
  Fix bug  wrongly printed strcmp() function results in creation of broken view.
mysql-test/r/view.result:
  Test case for bug  wrongly printed strcmp() function results in creation of broken view.
mysql-test/t/view.test:
  Test case for bug  wrongly printed strcmp() function results in creation of broken view.
2005-08-31 00:54:41 +04:00
unknown
aa0be84221 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-im-tests-fw
2005-08-31 00:29:29 +04:00
unknown
a9992fd06d Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-08-30 13:49:46 -05:00
unknown
bffb5d0048 Fixes bug . Convert file path to UNIX format to build correct query
string while replicating LOAD DATA INFILE statement.


VC++Files/mysys/mysys.dsp:
  added mf_unixpath.c into mysys.dsp
include/my_sys.h:
  Added an option for fn_format function to convert path from system representation
  to UNIX format.
mysys/mf_format.c:
  Added an option for fn_format function to convert path from system
  representation to UNIX format.
sql/log_event.cc:
  Convert file path to UNIX format to build correct query string while replicating
  LOAD DATA INFILE statement.
2005-08-30 22:19:15 +04:00
unknown
a02f8735af ha_innodb.cc:
Reorder out-of-order status variables


sql/ha_innodb.cc:
  Reorder out-of-order status variables
2005-08-30 13:17:50 -05:00
unknown
5bde29cb99 mysqld.cc:
Reorder out-of-order status variables


sql/mysqld.cc:
  Reorder out-of-order status variables
2005-08-30 13:16:40 -05:00
unknown
696a7bb3c5 set_var.cc:
Reorder out-of-order system variables


sql/set_var.cc:
  Reorder out-of-order system variables
2005-08-30 13:15:43 -05:00
unknown
8d17360181 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0
2005-08-30 11:07:48 -07:00
unknown
98a0f14dd9 Fix for bad merge.
mysql-test/r/archive.result:
  Updated result file
mysql-test/t/archive.test:
  Test fix. The INSERT DELAYED test must always come last.
sql/examples/ha_archive.h:
  Bad merge.
2005-08-30 11:04:23 -07:00
unknown
34f706c055 Manual merge. 2005-08-30 12:12:12 -05:00
unknown
25d8ffc2b7 Merge kite-hub.kitebird.com:/tmp/merge-4.1
into  kite-hub.kitebird.com:/tmp/merge-5.0


sql/set_var.cc:
  Auto merged
2005-08-30 12:11:11 -05:00
unknown
489e0f3bf8 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0


sql/handler.h:
  Auto merged
2005-08-30 08:28:55 -07:00
unknown
c4ca76a873 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug12720
2005-08-30 16:34:40 +04:00
unknown
2599491a67 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b9613
2005-08-30 17:32:53 +05:00
unknown
68e31099b0 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_delete.cc:
  After merge fix.
2005-08-30 12:35:37 +02:00
unknown
a05ccbb01d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug12720


sql/opt_range.cc:
  Auto merged
2005-08-30 14:15:05 +04:00
unknown
b9f94a911f Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-12672
2005-08-30 12:50:09 +03:00
unknown
de5f0f2b09 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql-5.0
2005-08-30 12:39:49 +03:00
unknown
c12a760ce9 Bug : Review fixes.
sql/ha_innodb.cc:
  Add 'value' parameter to reset_auto_increment.
sql/ha_innodb.h:
  Add 'value' parameter to reset_auto_increment.
sql/handler.h:
  Add 'value' parameter to reset_auto_increment.
sql/mysql_priv.h:
  Add 'reset_auto_increment' parameter to mysql_delete.
sql/sql_delete.cc:
  Add 'reset_auto_increment' parameter to mysql_delete, and use it instead
  of checking for SQLCOM_TRUNCATE.
  
  mysql_truncate: Adapt to changes in mysql_delete.
sql/sql_parse.cc:
  mysql_execute_command: Adapt to changes in mysql_delete.
2005-08-30 12:39:20 +03:00
unknown
8a06f4ecb9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b9613
2005-08-30 14:23:06 +05:00
unknown
8a1a4996f4 Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-08-30 11:09:51 +02:00
unknown
94c6c0396d Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-12672
2005-08-30 11:52:27 +03:00
unknown
e795dc207f Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-08-30 10:52:11 +02:00
unknown
b3dcaff948 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql-5.0
2005-08-30 10:42:51 +03:00
unknown
dcbbffa525 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b9613


sql/set_var.cc:
  Auto merged
2005-08-30 12:33:58 +05:00
unknown
c4b17ea9f4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-30 09:02:04 +02:00
unknown
a6396b6fae Merge eel.(none):/home/jonas/src/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-30 09:00:23 +02:00
unknown
ffcaabe36e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-30 08:59:17 +02:00
unknown
d18d32bd4b Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
2005-08-30 08:58:41 +02:00
unknown
d3833a7a01 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-30 08:57:30 +02:00
unknown
8b4af60894 bug#12862 - ndb compile error
fix typo


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  fix typo
2005-08-30 08:56:46 +02:00
unknown
e3ba68f3ce Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
2005-08-30 08:18:27 +02:00
unknown
9a0b0e6dbc Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-08-30 08:17:44 +02:00
unknown
86ad0b2141 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0
2005-08-29 18:03:56 -07:00
unknown
40cfe1e9cd ha_blackhole.cc:
Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!


sql/ha_blackhole.cc:
  Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!
2005-08-30 02:46:03 +02:00
unknown
476843eff6 Fix for BUG#12720: In QUICK_RANGE_SELECT::reset(), reset in_range so next get_next() call
doesn't continue reading the last range.


mysql-test/r/index_merge_innodb.result:
  Testcase for BUG#12720
mysql-test/t/index_merge_innodb.test:
  Testcase for BUG#12720
2005-08-30 03:14:39 +04:00
unknown
3120397290 Update for delete_all_rows() which will be used for TRUNCATE and DELETE support.
mysql-test/t/archive.test:
  Auto merged
sql/handler.h:
  Auto merged
mysql-test/r/archive.result:
  Result sets
sql/examples/ha_archive.cc:
  Update for tests
sql/examples/ha_archive.h:
  Updated from merge, added new method for solving truncate problems.
2005-08-29 15:26:05 -07:00
unknown
341a08edd3 Added support for delete_all_rows() for archive. This fixes bug .
mysql-test/r/archive.result:
  Update for test case to make sure that TRUNCATE and DELETE function(hah!) as designed.
mysql-test/t/archive.test:
  Add TRUNCATE and DELETE support.
sql/examples/ha_archive.cc:
  Added delete_all_rows() support.
sql/examples/ha_archive.h:
  Added delete_all_rows() support.
sql/handler.h:
  Added flags for fast delete support for archive and federated.
2005-08-29 15:05:16 -07:00
unknown
69f7e35cd8 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-29 14:41:00 -07:00
unknown
8ebccda1ec Merge lmy004.:/work/mysql-5.0-clean into lmy004.:/work/mysql-5.0-ready5 2005-08-29 22:28:01 +02:00
unknown
e7816165b8 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy004.:/work/mysql-5.0-clean
2005-08-29 21:34:42 +02:00
unknown
a5403486b5 Remove a no longer used header. 2005-08-29 23:32:47 +04:00
unknown
26b6b1b2a2 Cleanup the instance manager code.
BitKeeper/deleted/.del-factory.h~c1679505d3a6dd53:
  Delete: server-tools/instance-manager/factory.h
BitKeeper/deleted/.del-factory.cc~6836cccd4cd35b4d:
  Delete: server-tools/instance-manager/factory.cc
server-tools/instance-manager/Makefile.am:
  - remove Commands_factory: it'll be needed when we add support
  for NNTP/HTTP connections, currently it only adds unnecessary
  complexity.
server-tools/instance-manager/commands.cc:
  - fix coding style: no else after return; fix comments, make
  one place a bit faster.
server-tools/instance-manager/guardian.cc:
  - fix coding style and comments.
  - we must register the current thread in the thread registry
    before entering pthread_cond_timedwait, because at shutdown
    the thread registry will try to kick out of wait all blocked 
    threads. Unregistered threads are not awakened by the registry. 
    This fixes the failinig assert in Thread_registry::~Thread_registry
    at shutdown, when shutdown is requested and there is an
    instance monitored by Guardian.
server-tools/instance-manager/guardian.h:
  - fix coding style: enums must start with enum_
server-tools/instance-manager/instance.h:
  - move comment to the variable it comments
server-tools/instance-manager/instance_map.cc:
  - cleanup
server-tools/instance-manager/instance_options.cc:
  - cleanup; no else after return (fix coding style).
server-tools/instance-manager/manager.cc:
  - fix alignment; make some code easier to read.
server-tools/instance-manager/mysql_connection.cc:
  - remove Commands_factory
server-tools/instance-manager/options.cc:
  - fix a possible crash when the instance manager is started with
  --no-defaults --defaults-file=~/.my.cnf: if we return
  without cloning saved_argv by calling load_defaults, Options::cleanup
  will crash on attempt to free_defaults(saved_argv);
server-tools/instance-manager/parse.cc:
  - get rid of Commands_factory
server-tools/instance-manager/parse.h:
  - get rid of Commands_factory
server-tools/instance-manager/parse_output.cc:
  - in parse_output_and_get_value return error also if the specified
    pattern was not found, or the command failed to execute.
server-tools/instance-manager/portability.h:
  - fix coding style (// comments are allowed only at ends of lines)
server-tools/instance-manager/thread_registry.cc:
  - implement Thread_registry::cond_timedwait
server-tools/instance-manager/thread_registry.h:
  - implement Thread_registry::cond_timedwait; remove
    unused out parameter from Thread_registry::cond_wait.
server-tools/instance-manager/user_map.cc:
  - safety: newline can take 2 bytes.
2005-08-29 23:29:35 +04:00