1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Commit Graph

18792 Commits

Author SHA1 Message Date
a131e4d12d Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


sql/item.h:
  Auto merged
2005-03-16 17:50:03 -08:00
31f6b0dde8 olap.result, olap.test:
Added a test for bug #8615.
sql_select.cc:
  Fixed bug #8615.
  This fix only removed the cause of the reported crash.
  It does not resolve other problems of rollup queries
  with DISTINCT. They were fixed in the previous patch 
  for bug 8616.


sql/sql_select.cc:
  Fixed bug #8615.
  This fix only removed the cause of the reported crash.
  It does not resolve other problems of rollup queries
  with DISTINCT. They were fixed in the previous patch 
  for bug 8616.
mysql-test/t/olap.test:
  Added a test for bug #8615.
mysql-test/r/olap.result:
  Added a test for bug #8615.
2005-03-16 15:55:04 -08:00
2815daf7f7 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1 2005-03-16 23:44:47 +01:00
74007170b5 Fixes after Sinisa and Serg comments after push of patch for BUG#9123.
BUG#9123 is solved earlier than this patch though.
2005-03-16 21:56:56 +01:00
5be39a0c95 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2005-03-16 16:44:31 +01:00
0f3b3d3a7b Add information to the log file written by 'Do-compile' that allows to calculate
the time spent in the various steps.


Build-tools/Do-compile:
  Add information to the log file that allows to calculate the time spent in the
  various steps:
  
  1) Introduce a global variable 'global_step'.
  2) Before each major step, set it to some descriptive value.
  3) Expand the 'log_timestamp()' function to take a parameter (typical: "START",
     "DONE", or "ABORT") and append that to the timestamp in the log file,
     followed by the contents of 'global_step'.
  4) Add the "START" string as parameter to the 'log_timestamp' calls preceding a step.
  5) Add 'log_timestamp("DONE");' calls after the relevant steps.
  6) Add 'log_timestamp("ABORT");' calls to the error exits.
2005-03-16 16:33:06 +01:00
98eecc7b35 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-03-16 17:06:04 +02:00
333fbf623f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-03-16 15:44:31 +02:00
bf79f36287 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/bkroot/mysql-4.1
2005-03-16 14:44:30 +01:00
b3a5e5b1fd Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
not always correct for NULL values.
Now they always result a non NULL value even
the argument is NULL. It is more usefull for 
debugging purposes.


mysql-test/r/func_str.result:
  Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
  not always correct for NULL values.
  
  Also, a mistake in EXPORT_SET was fixed.
mysql-test/t/func_str.test:
  Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
  not always correct for NULL values.
sql/item_func.cc:
  Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
  not always correct for NULL values.
sql/item_strfunc.cc:
  Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
  not always correct for NULL values.
  
  A minor mistake in EXPORT_SET() was fixed.
2005-03-16 17:44:29 +04:00
34b8db0532 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/bkroot/mysql-4.1
2005-03-16 14:44:29 +01:00
a5c87958a6 Fix for bug#8656: Crash with group_concat on alias in outer table
fixed result_field support of Item_ref
2005-03-16 16:44:28 +03:00
36c3583618 Fix to get --skip-ndb to work 2005-03-16 15:32:43 +02:00
43a954666f BUG#9123: Updates after Mats review 2005-03-16 13:57:59 +01:00
c401b960a2 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/bkroot/mysql-4.1
2005-03-16 13:57:58 +01:00
9245168429 Fix for bug #7100: relay_log_space_max missing from SHOW VARIABLES 2005-03-16 15:57:57 +03:00
04a23d94f8 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/bkroot/mysql-4.1
2005-03-16 12:49:44 +01:00
49a61208e6 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1-bug8785
2005-03-16 14:35:44 +04:00
5f989d1e99 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/bkroot/mysql-4.1
2005-03-16 08:58:48 +01:00
83a242a092 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1
client/mysqldump.c:
  Auto merged
2005-03-16 08:14:05 +01:00
e16535ce19 olap.result, olap.test:
Added a test case for bug #8616.
item.h:
  Fixed bug #8616.
  Added class Item_null_result used in rollup processing.
sql_select.h, sql_select.cc:
  Fixed bug #8616.
  Added JOIN::rollup_write_data to cover rollup queries
  with DISTINCT. Modified other rollup methods.


sql/sql_select.cc:
  Fixed bug #8616.
  Added JOIN::rollup_write_data to cover rollup queries
  with DISTINCT. Modified other rollup methods.
sql/sql_select.h:
  Fixed bug #8616.
  Added JOIN::rollup_write_data to cover rollup queries
  with DISTINCT. Modified other rollup methods.
sql/item.h:
  Fixed bug #8616.
  Added class Item_null_result used in rollup processing.
mysql-test/t/olap.test:
  Added a test case for bug #8616.
mysql-test/r/olap.result:
  Added a test case for bug #8616.
2005-03-15 22:50:54 -08:00
2576beab6b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-16 07:47:02 +01:00
7dc31480de Change mysql prompt while inside a multiline comment. (Bug #9186)
client/mysql.cc:
  Change prompt to "/*> " when inside a multiline comment.
2005-03-15 17:33:06 -08:00
5ed4fd6ba9 Fix 'tee' command in mysql client. (Bug #8499)
client/mysql.cc:
  A va_list can't be reused without being copied or reset, so
  don't try to reuse it in tee_fprintf().
2005-03-15 16:37:05 -08:00
61b1f2ce95 Fix handling of the -e flag to my_print_defaults. (Bug #9136)
mysys/default.c:
  Don't automatically reset defaults_extra_file in load_defaults(),
  only update it based on it appearing as a command-line option.
2005-03-15 15:54:57 -08:00
da911ec8f1 Partly reverty back patch (in heap-auto-increment-key detection) to ensure that auto_key and auto_key_type are calculated the same way
heap/hp_create.c:
  Partly reverty back patch to ensure that auto_key and auto_key_type are calculated the same way
include/heap.h:
  Partly reverty back patch to ensure that auto_key and auto_key_type are calculated the same way
mysql-test/mysql-test-run.sh:
  made --skip-ndb a synonyme for --skip-ndbcluster
sql/ha_heap.cc:
  Partly reverty back patch to ensure that auto_key and auto_key_type are calculated the same way
2005-03-16 01:15:45 +02:00
32e027ead7 Bug #6660 mysqldump creates bad pathnames on Windows
sql_show.cc:
  changed strdup to thd->memdup per Serg's advice


sql/sql_show.cc:
  changed strdup to thd->memdup per Serg's advice
2005-03-15 16:24:37 -06:00
0362614793 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-15 22:20:57 +01:00
4ff085f2a2 Fix for bug#9166: Cluster compile failure on Solaris 10 2005-03-15 22:19:55 +01:00
822a46d593 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
2005-03-15 11:37:14 -06:00
ccfd174670 Bug #6660 mysqldump creates bad pathnames on Windows
This is a modifiction of my previous patch after receiving feedback. This is a better way to fix the problem.  With this patch, data directory and index directory will use only forward slashes (/) when on Windows.

mysqldump.c:
  Removed fixPaths routine.  Was improper fix for bug #6660
sql_show.cc:
  Changed append_directory to convert backslashes to foward slashes when on Windows.


sql/sql_show.cc:
  Changed append_directory to convert backslashes to foward slashes when on Windows.
client/mysqldump.c:
  Removed fixPaths routine.  Was improper fix for bug #6660
2005-03-15 11:33:06 -06:00
0e802637cc BUG#9123: If a table name is given with an underscore,
then this must be properly quoted when sent to 
SHOW TABLES LIKE ...
2005-03-15 16:23:02 +01:00
c703954578 # Bug#8785 Problem with nested concats and
character set conversion of a string constant.


mysql-test/r/ctype_utf8.result:
  Adding test
mysql-test/t/ctype_utf8.test:
  Addign test
sql/item_strfunc.cc:
  Remove previous fix: it was not 100% correct.
  A non const_item() can return a constant String.
sql/sql_string.h:
  A new method to cut Alloced_length to str_length for
  string constants, to avoid reusing them as a buffer
  in things like CONCAT().
2005-03-15 17:15:47 +04:00
e656fba778 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-03-15 14:48:09 +02:00
be26b49969 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-03-15 13:48:08 +01:00
0d0c6ba614 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-03-15 13:44:55 +01:00
c8e834e995 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-03-15 14:40:16 +02:00
188d2c26fd Proactive compile fix (in case we ever enable "EVENT_DEBUG" on IRIX).
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Proactive compile fix (in case we ever enable "EVENT_DEBUG" on IRIX):
  Two identical declarations on loop level will collide at function level.
2005-03-15 12:40:28 +01:00
0ba3164e0e A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end).
sql/filesort.cc:
  A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end).              
  Should call ha_rnd_end() only if ha_rnd_init() was called.
2005-03-15 15:32:11 +04:00
8418e31fc3 - Build fix for Do-solaris-pkg: fixed package name matching regex to be satisfied with
"mysql-pro-gpl-cert" packages as well (thanks to Kent for the suggestion)


Build-tools/Do-solaris-pkg:
  - fixed package name matching regex to be satisfied with "mysql-pro-gpl-cert" packages as well
    (thanks to Kent for the suggestion)
2005-03-15 12:27:44 +01:00
39005884b5 Applied some changes to the mysql.server init script that are already shipped as an additional patch
in the 4.1.10a RPMs for SLES9/RHEL3:

- small improvement: use LSB functions to display startup success and failure, if available.
  Fall back to more primitive builtin functions otherwise.
- joined two pieces of code performing the same functionality into one "wait_for_pid" function
- added a "reload" function (LSB requirement)


support-files/mysql.server.sh:
  - small improvement: use LSB functions to display startup success and failure, if available.
    Fall back to builtin functions otherwise.
  - joined two pieces of code performing the same functionality into one "wait_for_pid" function
  - added a "reload" function (LSB requirement)
2005-03-15 12:23:14 +01:00
23d48b7dc3 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b8799
2005-03-15 14:13:44 +04:00
9c04a77e0c A fix (bug #8489: Strange auto_increment behaviour with HEAP table).
heap/hp_create.c:
  A fix (bug #8489: Strange auto_increment behaviour with HEAP table).
  Handle autoincrement keys MyISAM-way.
include/heap.h:
  A fix (bug #8489: Strange auto_increment behaviour with HEAP table).
  Handle autoincrement keys MyISAM-way.
sql/ha_heap.cc:
  A fix (bug #8489: Strange auto_increment behaviour with HEAP table).
  Handle autoincrement keys MyISAM-way.
2005-03-15 13:32:12 +04:00
bcabdc22bf Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/mysql-4.1


innobase/dict/dict0load.c:
  SCCS merged
2005-03-15 11:14:57 +02:00
f56889321f buf0flu.c:
Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user


innobase/buf/buf0flu.c:
  Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user
2005-03-15 08:33:47 +02:00
7e517f7319 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug8510
2005-03-15 09:33:46 +03:00
786b52e106 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
2005-03-14 20:22:15 -06:00
62ce8731e2 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0
into snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1


BitKeeper/etc/logging_ok:
  auto-union
2005-03-14 19:59:59 -06:00
6d0ec316a8 mysql.1.in:
Fix path that needs no parameterization.


man/mysql.1.in:
  Fix path that needs no parameterization.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-14 19:59:00 -06:00
155cfb3942 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug8510


sql/set_var.cc:
  Auto merged
2005-03-15 04:09:41 +03:00