1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Commit Graph

37337 Commits

Author SHA1 Message Date
e5e045cd54 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-06-13 13:04:33 +02:00
69ff5fff3c Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
2007-06-13 12:58:56 +02:00
e63306a8c5 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0


configure.in:
  Auto merged
2007-06-13 12:56:43 +02:00
a6b7ab6bf4 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0


configure.in:
  null-merge version number change
2007-06-13 12:37:10 +02:00
443e2819c6 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
2007-06-13 12:35:13 +02:00
43e77e6147 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit


BitKeeper/triggers/post-commit:
  Remove dev-public@ / dev-bugs@ e-mail, is now handled differently. Merge fix for 5.0.
2007-06-13 11:54:28 +02:00
d87c987533 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
2007-06-13 11:48:07 +02:00
ff265ac842 BK changes for
https://inside.mysql.com/wiki/MySQL's_Code_Reviews_Published_Externally


BitKeeper/triggers/post-commit:
  1) Add additional method of detecting merge changesets.
  2) Remove code sending e-mail to dev-public@ or dev-bugs@.
  3) Change code sending e-mail to commits@ to send to dev-private@ if a specific file is present in the BK root directory, denoting this tree as private.
2007-06-13 11:44:58 +02:00
dc6c3b31d8 Merge mysql.com:/home/ram/work/mysql-5.0-maint
into  mysql.com:/home/ram/work/b28748/b28748.5.0
2007-06-13 14:21:44 +05:00
9cb0a84c7e Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Manual merge
2007-06-13 10:36:47 +02:00
3aa6d3f51a Bug#29065 mysql-test-run.pl aborts execution on missing log file from test tool
- Make tesingt continue even if test log file does not exists


mysql-test/mysql-test-run.pl:
  Allow execution to continue even if no log file has been
  generated by the test tool - it's not a critical error
2007-06-13 10:35:20 +02:00
06b6749e29 make_win_bin_dist:
Aligned headers to include with Unix 'make install'


scripts/make_win_bin_dist:
  Aligned headers to include with Unix 'make install'
2007-06-12 19:49:02 +02:00
5965e8879b Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
2007-06-12 10:33:39 -04:00
7c81e00235 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2


sql/sql_parse.cc:
  Auto merged
2007-06-12 08:48:30 -04:00
3a364d5172 Bug#28984: crasher on connect with out of range password length in \
protocol

Fixed duplicated code, same as last commit.

One could send a malformed packet that caused the server to SEGV.  In 
recent versions of the password protocol, the client tells the server 
what length the ciphertext is (almost always 20).  If that length was
large enough to overflow a signed char, then the number would jump to 
very large after being casted to unsigned int.

Instead, cast the *passwd char to uchar.


sql/sql_parse.cc:
  Additional location of signed-char casted to uint.
2007-06-12 08:47:36 -04:00
119412f8d0 removed compilation warning 2007-06-12 14:45:30 +03:00
e4cd7e985f Merge bk-internal:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B28992-5.0-opt
2007-06-12 14:37:14 +03:00
030bb02b69 Bug #28992: trigger fails in pushbuild
- fixed wrong test case for bug 20903
 - closed the dangling connections in trigger.test
 - GET_LOCK() and RELEASE_LOCK() now produce more detailed log
 - fixed an omission in GET_LOCK() : assign the thread_id when
    acquiring the lock.


mysql-test/r/trigger.result:
  Bug #28992: test case updated
mysql-test/t/trigger.test:
  Bug #28992: test case updated. dangling connections closed.
sql/item_func.cc:
  Bug #28992: 
   - GET_LOCK() and RELEASE_LOCK() now produce more detailed log
   - fixed an omission in GET_LOCK() : assign the thread_id when
      acquiring the lock.
2007-06-12 14:35:36 +03:00
fd4f52a3f5 VC++Files/sql/mysqld.vcproj
Ensure ".pdb" and ".map" files are created for the MySQL server, in all configurations.


VC++Files/sql/mysqld.vcproj:
  Ensure ".pdb" and ".map" files are created for the MySQL server, in all configurations.
2007-06-12 10:25:24 +02:00
e43380e8b7 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B28934-5.0-opt
2007-06-12 11:11:12 +03:00
e164c08eaf Bug #28934: server crash when receiving malformed com_execute packets
Sometimes a parameter slot may not get a value because of the protocol
 data being plain wrong.
 Such cases should be detected and handled by returning an error.
 Fixed by checking data stream constraints where possible (like maximum
 length) and reacting to the case where a value cannot be constructed.


sql/sql_prepare.cc:
  Bug #28934: 
   - check for a parameter slot not being set because 
      of wrong data
   - check if the length read from the stream is not
      greater than the maximum length of the field
tests/mysql_client_test.c:
  Bug #28934: test case
2007-06-12 11:02:34 +03:00
d447929a02 Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


sql/sql_select.cc:
  Auto merged
2007-06-12 11:42:39 +04:00
4c631119e2 libmysqld.def:
Corrected name of mysql_thread_{init,end} (bug#29007)


libmysqld/libmysqld.def:
  Corrected name of mysql_thread_{init,end} (bug#29007)
2007-06-12 01:33:23 +02:00
ccf393b67a Bug#28904: INSERT .. ON DUPLICATE was silently updating rows when it shouldn't.
When the INSERT .. ON DUPLICATE KEY UPDATE has to update a matched row but
the new data is the same as in the record then it returns as if
no rows were inserted or updated. Nevertheless the row is silently
updated. This leads to a situation when zero updated rows are reported 
in the case when data has actually been changed.

Now the write_record function updates a row only if new data differs from
that in the record.


sql/sql_insert.cc:
  Bug#28904: INSERT .. ON DUPLICATE was silently updating rows when it shouldn't.
  Now the write_record function updates a row only if new data differs from
  that in the record.
mysql-test/r/insert_update.result:
  Added a test case for the bug#28904: INSERT .. ON DUPLICATE was silently
  updating rows when it shouldn't.
mysql-test/t/insert_update.test:
  Added a test case for the bug#28904: INSERT .. ON DUPLICATE was silently
  updating rows when it shouldn't.
2007-06-12 01:41:23 +04:00
1c4ab3106e Fix for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"
In create_tmp_table() don't set full table path as a table name. Other code assumes table names to not exceed NAME_LEN bytes.


sql/sql_select.cc:
  In create_tmp_table() don't set full table path as a table name. Other code assumes table names to not exceed NAME_LEN bytes.
mysql-test/r/long_tmpdir.result:
  Added testcase for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"
mysql-test/t/long_tmpdir-master.opt:
  Added testcase for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"
mysql-test/t/long_tmpdir-master.sh:
  Added testcase for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"
mysql-test/t/long_tmpdir.test:
  Added testcase for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"
2007-06-11 23:06:20 +04:00
5afdd974c8 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge


sql/field.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
2007-06-11 11:32:10 -06:00
975b084d3d Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-11 17:40:53 +02:00
84910c5a87 Merge chilla.local:/home/mydev/mysql-5.0-amain
into  chilla.local:/home/mydev/mysql-5.0-axmrg


configure.in:
  Auto merged
2007-06-11 17:40:01 +02:00
0f47919597 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-06-11 16:48:05 +02:00
ec4fc41610 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-06-11 16:46:46 +02:00
62b7d367e0 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-06-11 16:42:24 +02:00
60c2ff08a4 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
2007-06-11 16:41:46 +02:00
7da98b93e1 Merge chilla.local:/home/mydev/mysql-4.1-amain
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2007-06-11 16:24:29 +02:00
a28ec7b8ef Merge trift2.:/MySQL/M41/push-4.1
into  trift2.:/MySQL/M50/push-5.0
2007-06-11 15:54:05 +02:00
bf7d4fe8ff Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
2007-06-11 09:53:57 +02:00
4c40289a49 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-06-11 09:44:15 +02:00
fd2531c6cf mysqldemb.vcproj:
Added lots of missing files to make "mysqlserver.lib" complete (bug#29007)
mysql.sln:
  Let 'mysqlserver' project also depend on 'vio', else "vio.lib" will
  not be linked into the "mysqlserver.lib" static embedded lib (bug#29007)


VC++Files/mysql.sln:
  Let 'mysqlserver' project also depend on 'vio', else "vio.lib" will
  not be linked into the "mysqlserver.lib" static embedded lib (bug#29007)
VC++Files/mysqldemb/mysqldemb.vcproj:
  Added lots of missing files to make "mysqlserver.lib" complete (bug#29007)
2007-06-10 19:07:18 +02:00
59d139eb29 compiler warning fix 2007-06-09 18:18:34 +05:00
9c93c5b992 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-06-09 17:46:34 +05:00
71aa571d09 Bug#28149 overflow in some "SHOW STATUS"-variables
changed bytes_received, bytes_sent status variables to longlong


sql/mysqld.cc:
  changed bytes_received, bytes_sent status variables to longlong
sql/sql_class.h:
  changed bytes_received, bytes_sent status variables to longlong
sql/sql_show.cc:
  changed bytes_received, bytes_sent status variables to longlong
sql/structs.h:
  changed bytes_received, bytes_sent status variables to longlong
2007-06-09 17:46:09 +05:00
7a86568318 Fix for bug #28748: "Select" returning one value too few
Problem: we may get unexpected results comparing [u]longlong values as doubles.
Fix: adjust the test to use integer comparators.
Note: it's not a real fix, we have to implement some new comparators 
to completely solve the original problem (see my comment in the bug report).


mysql-test/r/func_in.result:
  Fix for bug #28748: "Select" returning one value too few
    - result adjusted.
mysql-test/t/func_in.test:
  Fix for bug #28748: "Select" returning one value too few
    - test adjusted to use integer comparisons.
2007-06-09 17:13:33 +05:00
6329053f95 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/hf/work/28333/my50-28333
2007-06-09 16:52:38 +05:00
ce4e9f7580 Bug#28266 IS_UPDATABLE field on VIEWS table in I_S database is wrong
IS_UPDATABLE flag is set to 'yes' when the view has at least one updatable column and
the algorithm is not 'temporary'.


mysql-test/r/information_schema.result:
  test result
mysql-test/r/view.result:
  test result
mysql-test/t/information_schema.test:
  test case
mysql-test/t/view.test:
  test case
sql/sql_show.cc:
  IS_UPDATABLE flag is set to 'yes' when the view has at least one updatable column and
  the algorithm is not 'temporary'.
2007-06-09 16:52:37 +05:00
cb460d88b9 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/28333/my50-28333
2007-06-09 15:56:04 +05:00
d1a8d7f431 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B28754-5.0-opt
2007-06-09 09:02:21 +03:00
a3cec3e0a9 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/41gca
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2


sql/sql_parse.cc:
  Auto merged
2007-06-08 17:06:29 -04:00
606927f78f Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-06-08 16:52:40 -04:00
5fbb42ecbe Merge zippy.cornsilk.net:/home/cmiller/work/mysql/41gca
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-release
2007-06-08 16:28:48 -04:00
c1585aea56 Bug #28984: crasher on connect with out of range password length in \
protocol

One could send a malformed packet that caused the server to SEGV.  In 
recent versions of the password protocol, the client tells the server 
what length the ciphertext is (almost always 20).  If that length was
large enough to overflow a signed char, then the number would jump to 
very large after being casted to unsigned int.

Instead, cast the *passwd char to uchar. 



sql/sql_parse.cc:
  Cast *passwd to get rid of the sign, so that sign extension doesn't
  cause the sequence 125, 126, 127, 4294967169, 4294967170.
2007-06-08 16:10:53 -04:00
99b4321ac5 Bug #28333 Test "flush" tries to create a new thread - on only one platform
on PPC/Debian Linux default stack size for a thread is too big.
As we use default thread settings in mysqltest, the
thread creation fails if we create lots of threads (as it
happens in flush.test). So now stack size is explicitly specified
for the mysqltest


client/mysqltest.c:
  Bug #28333 Test "flush" tries to create a new thread - on only one platform
  
  specify appropriate stack size for the 'query' thread
2007-06-09 00:39:23 +05:00