Commit graph

27747 commits

Author SHA1 Message Date
unknown
768b1e5087 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.13573


sql/item_func.cc:
  Auto merged
2005-11-02 13:01:21 +04:00
unknown
85b939715a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-11-02 08:28:07 +01:00
unknown
17fcbcf772 BUG#14026: When doing the end-of-prepare fix up for TABLE_LISTs used in the PS, do the fixup
for underlying tables of a merge VIEWs, too.


mysql-test/r/view.result:
  Testcase for BUG#14026
mysql-test/t/view.test:
  Testcase for BUG#14026
2005-11-02 07:05:19 +03:00
unknown
02ac7bef87 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-11-01 17:07:13 -08:00
unknown
f887cdecfa Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-11-01 22:58:24 +02:00
unknown
19f78d5fdf Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-01 22:15:09 +02:00
unknown
a486b3d7c5 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean


scripts/mysqld_safe.sh:
  Auto merged
2005-11-01 12:15:08 -08:00
unknown
78ebed6436 Added missing DBUG_ENTER (bug in last push) 2005-11-01 21:59:24 +02:00
unknown
2dcc6cbea3 Add missing return
Compile max with --yassl instead of --with-openssl


sql/table.cc:
  Add missing return
BUILD/SETUP.sh:
  Compile max with --yassl instead of --with-openssl
2005-11-01 21:57:24 +02:00
unknown
dced934820 config/ac-macros/zlib.m4
Accept any shared library for "libz", not just the static one. Bug#6584
Repetition of the corresponding change, as the 4.1 "acinclude.m4" is not used in 5.0.


config/ac-macros/zlib.m4:
  Accept any shared library for "libz", not just the static one. Bug#6584
  Repetition of the corresponding change, as the 4.1 "acinclude.m4" is not used in 5.0.
2005-11-01 20:49:02 +01:00
unknown
c973948f00 merge 2005-11-02 08:46:13 +13:00
unknown
caf40acf28 Fix compile using libwrap with gcc 4.0.2. (Bug #12570)
sql/mysqld.cc:
  Fix const-ness of libwrapName variable.
2005-11-01 11:08:20 -08:00
unknown
1752d848df Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/14186-bug-5.0-mysql
2005-11-01 21:55:39 +03:00
unknown
7dba8c536b Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy004.:/work/mysql-5.0-bug14381
2005-11-01 19:41:24 +01:00
unknown
778088a546 fix for bug #14381
(BDB keylength limitted to 255)


mysql-test/r/bdb.result:
  fix bdb test after fixing the maximal length of BDB keys to 2^32-1
sql/ha_berkeley.h:
  use the maximal possible length of 2^32 - 1
2005-11-01 19:37:59 +01:00
unknown
7d8e803291 sql_update.cc:
After merge fix


sql/sql_update.cc:
  After merge fix
2005-11-01 20:53:27 +03:00
unknown
75c45caf2e Merge mysql.com:/home/jimw/my/mysql-4.1-13774
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-11-01 09:38:41 -08:00
unknown
fe11647273 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-11-01 09:08:50 -08:00
unknown
252f72a0b7 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
2005-11-01 18:08:24 +01:00
unknown
70536ba1b5 Manually merged
client/mysqltest.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/r/update.result:
  Auto merged
mysql-test/t/update.test:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
2005-11-01 19:47:53 +03:00
unknown
fc0769619f Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/data0/mysqldev/lenz/mysql-4.1
2005-11-01 17:46:00 +01:00
unknown
ca4e27b04f Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
2005-11-01 17:41:59 +01:00
unknown
45feb66623 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/data0/mysqldev/lenz/mysql-5.0


configure.in:
  Auto merged
2005-11-01 17:39:09 +01:00
unknown
cda9b1cbc9 Conflicts resolving
sql/item_func.cc:
  Auto merged
mysql-test/r/type_newdecimal.result:
  resolving
mysql-test/t/type_newdecimal.test:
  resolving
2005-11-01 20:37:27 +04:00
unknown
03ed0d1d24 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14186-bug-4.1-mysql


sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
2005-11-01 17:34:19 +03:00
unknown
1a467f12d8 Changed MTR_BUILD_THREAD port reserving policy. 2005-11-01 16:30:55 +02:00
unknown
7dd86f7570 Fix bug #14466 lost sort order in GROUP_CONCAT() in a view
Item_func_group_concat::print() wasn't printing sort order thus creating wrong
view. This results in reported error.


sql/item_sum.cc:
  Fix bug #14466 lost sort order in GROUP_CONCAT() in a view
  Now Item_func_group_concat::print() prints sort order.
mysql-test/r/view.result:
  Test case for bug #14466 lost sort order in GROUP_CONCAT() in a view
mysql-test/t/view.test:
  Test case for bug #14466 lost sort order in GROUP_CONCAT() in a view
2005-11-01 17:27:10 +03:00
unknown
ee380a0777 Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort
Fix for bug #14536: SELECT @a,@a:=... fails with prepared statements


mysql-test/r/func_sapdb.result:
  Correct tests after reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)
mysql-test/r/type_newdecimal.result:
  Correct tests after reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)
mysql-test/r/user_var.result:
  More test with SELECT @a:=
mysql-test/t/disabled.def:
  Enable user_var.test for
mysql-test/t/user_var.test:
  More test with SELECT @a:=
sql/item.cc:
  Simple optimization during review of new code
sql/item_func.cc:
  Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)
sql/item_timefunc.h:
  timediff() can return NULL for not NULL arguments
sql/sql_base.cc:
  Remove usage of current_thd() in mysql_make_view()
sql/sql_lex.h:
  Remove usage of current_thd() in mysql_make_view()
sql/sql_select.cc:
  Fix for bug #14536: SELECT @a,@a:=... fails with prepared statements
sql/sql_view.cc:
  Remove usage of current_thd() in mysql_make_view()
  Simple optimization of new code
sql/sql_view.h:
  Remove usage of current_thd() in mysql_make_view()
sql/table.cc:
  Simple optimization of new code
2005-11-01 15:54:30 +02:00
unknown
f9dbcd558a Additional fix for bug #14445 (analyse.test fails)
mysql-test/r/analyse.result:
  test result fixed
mysql-test/t/disabled.def:
  user_var disabled
sql/sql_analyse.cc:
  rounding added
2005-11-01 16:14:26 +04:00
unknown
fffe741705 Review of new pushed code
Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
Mark that add_time(), time_diff() and str_to_date() can return null values


myisam/mi_check.c:
  keyoffset is not a position (no %lx here)
mysql-test/r/func_sapdb.result:
  Fixed test after marking that timediff() can return NULL
sql/item_func.cc:
  Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
sql/item_timefunc.cc:
  Mark that add_time and str_to_date() can return null values
sql/item_timefunc.h:
  Mark that time_diff can return 0
sql/spatial.cc:
  Simple cleanups during review of new code
2005-11-01 13:00:02 +02:00
unknown
d8dac8bf0d Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
2005-11-01 10:54:55 +01:00
unknown
8439e6a482 Fix for bug #14183 (ctype_cp983.test fails with the embedded server)
mysql-test/r/ctype_cp932.result:
  result fixed
mysql-test/t/ctype_cp932.test:
  these lines don't work in embedded-server
2005-11-01 13:18:46 +04:00
unknown
cc6db6d888 Fix for bug #14445 (analyse.test fails)
mysql-test/r/analyse.result:
  test result fixed
sql/sql_analyse.cc:
  missing sqrt(std_sqr) added
2005-11-01 13:08:14 +04:00
unknown
389018280d gis.test fixed
mysql-test/r/gis.result:
  test result fixed
2005-11-01 11:43:34 +04:00
unknown
34db50d9a6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-11-01 08:25:22 +01:00
unknown
cc953ed32a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/mysql-4.1
2005-11-01 09:52:45 +04:00
unknown
abf4f669a6 BUG#13126: Post-review fixes: better comments, some function renaming.
sql/mysql_priv.h:
  BUG#13126: Post-review fixes: better comments
2005-11-01 08:36:49 +03:00
unknown
81aa2a351c Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-10-31 17:28:11 -08:00
unknown
31b6796238 BUG# 14532
Post-review fixes


mysql-test/r/federated.result:
  BUG# 14532
  
  Regenerated test results
mysql-test/t/federated.test:
  BUG# 14532 
  
  Added comments to test
2005-10-31 17:26:45 -08:00
unknown
fe3d5732f7 mysql-test-run.pl:
Make IM ports change with MTR_BUILD_THREAD


mysql-test/mysql-test-run.pl:
  Make IM ports change with MTR_BUILD_THREAD
2005-11-01 02:19:06 +01:00
unknown
67c6d0f071 BUG #14532
Added FIELD_TYPE_BIT to field method 'needs_quotes' to make BIT columns
work.


mysql-test/r/federated.result:
  BUG# 14532
  
  Test fix by creating table with bit column and inserting,selecting
mysql-test/t/federated.test:
  BUG# 14532
  
  Test fix by creating table with bit column and inserting,selecting
sql/field.cc:
  BUG #14532
  
  Just needed to quote/escape bit field, add FIELD_TYPE_BIT to switch
2005-10-31 17:17:16 -08:00
unknown
04fcd58e09 Fix harmless typo in mysql_fix_privilege_tables.sql (Bug #14469)
scripts/mysql_fix_privilege_tables.sql:
  Remove extra leading - in comment
2005-10-31 15:56:52 -08:00
unknown
d32e0486c6 postreview fixes
sql/item_func.cc:
  some optimisation
sql/sql_acl.cc:
  some optimisation
sql/sql_base.cc:
  some optimisation
sql/sql_parse.cc:
  some optimisation
sql/table.cc:
  some optimisation
2005-10-31 22:14:27 +02:00
unknown
ff546eed4b Handle decision to use mysqld-max over mysqld within mysqld_safe
even when --ledir option is specified. (Bug #13774)


scripts/mysqld_safe.sh:
  Figure out whether to use mysqld or mysqld-max after we have handled
  the command-line options and .cnf files.
2005-10-31 11:15:44 -08:00
unknown
65784838ae Fixed failure of NDB config retrieval.
1. Made sure that base64 string is terminated with NUL.
2. Made calculation of needed size for base64 string exact.
Added checks in test for the above two fixes.


mysys/base64.c:
  Made sure that base64 string is terminated with NUL.
  Made calculation of needed size for base64 string exact.
  Added checks in test for the above two fixes.
2005-10-31 19:57:57 +01:00
unknown
69f80875a6 improved previous changeset per JimW's review
server-tools/instance-manager/instance_options.cc:
  fixed to coding guidelines
server-tools/instance-manager/parse_output.cc:
  removed tabs
  and added call to trim_space
2005-10-31 13:31:07 -05:00
unknown
0125760fc8 fix some issues with IM and long pathnames (with spaces)
server-tools/instance-manager/instance_options.cc:
  small cleanup
  -and-
  convert mysqld_path to the proper syntax after reading
server-tools/instance-manager/parse_output.cc:
  stop using get_word since it stops at spaces.  Now we just read the entire line and trim spaces.
2005-10-31 13:31:06 -05:00
unknown
11632315c8 Fixed bugs in client/mysqltest.c which made lots of "connect" commands in tests fail.
client/mysqltest.c:
  Fixed crash bug in debug mode and make sure q->last_argument is set right
  so that check_eol_junk() will work again.
2005-10-31 19:31:05 +01:00
unknown
b1a1b4815f Accept any shared library for "libz", not just the static one. Bug#6584 2005-10-31 18:35:26 +01:00
unknown
17be53b0e2 Removed C++-isms from client/mysqltest.c
client/mysqltest.c:
  Removed C++-isms from C file.
2005-10-31 17:51:48 +01:00