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

29121 Commits

Author SHA1 Message Date
aa7b2261e9 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-02 20:46:37 +01:00
44c175b7ef Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  selena.:H:/MYSQL/src/#17595-mysql-5.0
2006-03-02 20:52:58 +03:00
b4c5906011 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-02 17:53:38 +01:00
9f055bf881 Remove superfluous DBUG_PRINT 2006-03-02 17:33:34 +01:00
ffd4bf5849 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0
2006-03-02 16:39:43 +01:00
326acd57c1 Make the "system" command become executed in a bash shell in cygwin.
client/mysqltest.c:
  Prepend the command to execute by system with "sh" to make it executed by cygwin's bash
mysql-test/t/mysqldump.test:
  Change from " to ' to avoid bash's filename expanding. I.e to avoid that "[mysqltest1]" will be llok for any dirs in mysql-test/* that are named m, y, s, q etc. And ther is actually one dir called t, so we will get a match and thus echo "t" to the file.
2006-03-02 16:28:45 +01:00
7865ce6188 Fixed BUG#17476: Stored procedure not returning data when it is called first
time per connection
  Removed const_string() method from Item_string (it was only used in one
  place, in a bad way). Defer possible SP variable, and access data directly
  instead, in date_format item.


mysql-test/r/sp.result:
  Updated results for new test (BUG#17476).
mysql-test/t/sp.test:
  New test case (BUG#17476)
sql/item.h:
  Removed const_string() from Item_string.
  It was only used in one place, and we can just use str_value in Item directly.
sql/item_timefunc.cc:
  Must defer a (possible) local SP variable to use max_length and str_value
  in Item_func_date_format::fix_length_and_dec(), and refer to str_value
  directly without the const_string() method (now removed); the cast didn't
  work in all cases anyway.
2006-03-02 14:54:04 +01:00
2ec1d015a9 configure.in:
cloned


configure.in:
  cloned
2006-03-02 12:24:07 +01:00
443ab798c5 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-02 11:17:07 +01:00
6164a44bf0 Make do_block return void, return value never used.
client/mysqltest.c:
  Make do_block return "void", will never return from "die" if error is detected
2006-03-02 11:10:29 +01:00
7968f05873 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/merge-5.0 2006-03-02 11:09:16 +01:00
97443c15d8 Fix unsigned warning on windows
client/mysqltest.c:
  Fix unsigned warning
2006-03-02 11:08:43 +01:00
b65b476727 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2006-03-02 11:07:48 +01:00
a7edc0c637 Merge mysql.com:/M41/merge-4.1 into mysql.com:/M50/merge-5.0
mysql-test/mysql-test-run.sh:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
2006-03-02 11:04:05 +01:00
d5a27fd86f Bug#17279 user with no global privs and with create priv in db can create
database
 - Fix test case for systems with "lowercase names"


mysql-test/r/grant2.result:
  Fix for system with "lowercase names", allow error 1007 to be returned
mysql-test/t/grant2.test:
  Fix for system with "lowercase names", allow error 1007 to be returned
2006-03-02 11:01:58 +01:00
92ead72dc7 Make the define start at "start of line" 2006-03-02 10:55:55 +01:00
b7ca534215 Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1
scripts/make_binary_distribution.sh:
  Auto merged
2006-03-02 10:48:46 +01:00
d2df7f5dac Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
2006-03-02 10:31:42 +01:00
cc3358cfef Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9088
2006-03-02 12:35:42 +04:00
306621137a Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9088
2006-03-02 12:34:05 +04:00
ffa7f9439a Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478


mysql-test/README:
  SCCS merged
2006-03-01 18:51:33 -06:00
35bb42d315 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
2006-03-01 18:44:44 -06:00
564c1d64f6 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-03-01 18:39:18 -06:00
5f95aa48d9 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478


mysql-test/README:
  Auto merged
2006-03-01 18:38:19 -06:00
aa9a497d7a README:
revise README.


mysql-test/README:
  revise README.
2006-03-01 18:37:41 -06:00
0b09fa04c2 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-03-01 17:57:47 -06:00
5b9669ccda Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
2006-03-01 17:55:41 -06:00
79faaddce7 README.gcov:
Revise README.gcov.


mysql-test/README.gcov:
  Revise README.gcov.
2006-03-01 17:55:10 -06:00
8d7f8929f5 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-03-01 17:48:17 -06:00
6f6205287d Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478


mysql-test/README:
  Auto merged
2006-03-01 17:41:34 -06:00
10f230539f Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1


mysql-test/README:
  Auto merged
2006-03-01 17:37:49 -06:00
7526342706 README:
Revise mysql-test README.


mysql-test/README:
  Revise mysql-test README.
2006-03-01 17:37:07 -06:00
720e13d665 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/M40/comment-4.0
2006-03-01 20:13:23 +01:00
eaaaa760e6 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/comment-4.1


mysql-test/mysql-test-run.sh:
  Auto merged
2006-03-01 17:43:16 +01:00
5af68d301d Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virgin
into  lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-bug-17523
2006-03-01 17:27:39 +01:00
65225c3ea9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-01 15:43:57 +01:00
924330bab4 Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virgin
into  lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-dbg
2006-03-01 15:43:57 +01:00
ea6f479b45 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2006-03-01 15:43:56 +01:00
774b9cb56a Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-03-01 08:43:56 -06:00
292c79679c Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-17523
2006-03-01 16:43:56 +02:00
195e3f3ba4 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/bugs/mysql-5.0-merged


sql/sql_db.cc:
  Merge
2006-03-01 17:43:55 +03:00
ab13e772d6 Dont' run the mysql_protocols on Windows 2006-03-01 15:22:47 +01:00
69012c7524 Bug#2845 client fails to reconnect if using TCP/IP
- Change to use non blocking read to empty channel in case of too large sd number
 - Don't check for too large socket number on Windows.


sql/net_serv.cc:
  Windows does not need protection from sd >= FD_SETSIZE, it uses an array to store the sd's it should read from.
  Change the handler for when "net_data_is_ready" returns -1 to perform nonblocking read to empty the net.
  Only include that handler if HAVE_POLL is not defined  and not windows
2006-03-01 15:21:03 +01:00
2281f754e2 Fixed BUG #16175: Memory leak in rpl_trigger.test
Allocating/freeing memory for the db member of THD
  is wholy managed by slave thread.
2006-03-01 16:21:01 +03:00
3437ad04ea Merge mysql.com:/M50/comment-5.0 into mysql.com:/M50/mysql-5.0 2006-03-01 13:35:32 +01:00
4ede8823b7 Manual merge of the added "--comment=<string>" option
to both the Shell and the Perl vaerion of "mysql-test-run"-


mysql-test/mysql-test-run.pl:
  Manual merge.
mysql-test/mysql-test-run.sh:
  Manual merge
2006-03-01 13:29:37 +01:00
ca3dd7f01a mysql-test/mysql-test-run.pl : Add a "--comment=<string>" option (backport from 5.1).
mysql-test/mysql-test-run.pl:
  Add a "--comment=<string>" option (backport from 5.1).
  Its sole purpose is to get logged, so that test evaluation gets easier.
  See "Do-compile" for how it is called, and "gen-build-status-page" for its effect.
2006-03-01 13:15:37 +01:00
dfbbcd2767 Merge mysql.com:/M40/comment-4.0 into mysql.com:/M41/comment-4.1
mysql-test/mysql-test-run.sh:
  Auto merged
2006-03-01 13:10:59 +01:00
b17bb278f7 bug #9088 (bigint WHERE fails)
mysql-test/r/bigint.result:
  test result
mysql-test/t/bigint.test:
  testcase
sql/item.h:
  unsigned_arg is a separate parameter now
sql/item_cmpfunc.cc:
  we can get unsigned field from the signed Item - from string
  like '1234'
2006-03-01 15:50:15 +04:00
6e0d2e41cc mysql-test/mysql-test-run.sh : Add a "--comment=<string>" option, to get it logged when the test is run.
mysql-test/mysql-test-run.sh:
  Add a "--comment=<string>" option, to get it logged when the test is run.
  The purpose is to allow a better analysis when generating the status page 
  ("gen-build-status-page").
  See "Do-compile" for how it is used.
2006-03-01 12:21:44 +01:00