monty@mysql.com
17d7ba931d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-10-08 03:37:23 +03:00
monty@mysql.com
f577ebb88f
Simple changes during review of code
...
Added back flag that I accidently removed in last patch
2005-10-08 00:57:40 +03:00
petr@mysql.com
dad1e2048d
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-10-07 20:40:09 +04:00
petr@mysql.com
54db9bab7c
fix compile failure (which shows up in cygwin environment)
2005-10-07 20:25:51 +04:00
tomas@poseidon.ndb.mysql.com
6844fea57a
added missing signal to VoidFs
2005-10-07 17:43:59 +02:00
ramil@mysql.com
e27a831506
Merge mysqldev@production.mysql.com:my/mysql-4.1-release
...
into mysql.com:/usr/home/ram/work/mysql-4.1
2005-10-07 20:34:40 +05:00
ramil@mysql.com
fcc51afb6a
Populate t1 in order to get more predictable explain results.
2005-10-07 20:14:34 +05:00
joerg@mysql.com
01a374d955
Copy zlib.a and valgrind.supp if exists.
...
Copy disabled.def
(Backport of Kent's change from the main tree to the 4.1.15 build clone.
Original changeset: 2005/10/07 13:08:07+02:00 kent@mysql.com )
2005-10-07 16:37:53 +02:00
kent@mysql.com
33f38f7ed8
make_binary_distribution.sh:
...
Copy zlib.a and valgrind.supp if exists
Copy disabled.def
2005-10-07 13:08:07 +02:00
kent@mysql.com
c68c4f3cb7
Merge
2005-10-07 12:55:00 +02:00
joerg@mysql.com
3a32f96e31
Increase the version number.
2005-10-07 12:50:29 +02:00
gluh@eagle.intranet.mysql.r18.ru
a31a4d4b9b
after merge fix
2005-10-07 15:09:44 +05:00
gluh@mysql.com
041eab4663
4.1 -> 5.0 merge
2005-10-07 14:26:32 +05:00
gluh@eagle.intranet.mysql.r18.ru
b2b8d8b276
Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails
...
allow select into outfile from I_S tables
it is enough to add FILE_ACL for I_S tables only to 'check_table_access' function
as we use 'any_db' for 'check_access' function in places where FILE_ACL is required
2005-10-07 14:16:44 +05:00
sergefp@mysql.com
140dea1426
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug13484
2005-10-07 11:14:40 +04:00
monty@mysql.com
3f73d25fba
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-10-07 04:02:53 +03:00
jimw@mysql.com
4a893c96e3
Fix use of "%*s" *printf() specifiers that were really meant to be
...
"%.*s". (Bug #13650 )
2005-10-06 17:37:24 -07:00
monty@mysql.com
82855517a1
Review of new code since last pull
...
- Use %lx instead of %p as %p is not portable
- Don't replace ROW item with Item_null
2005-10-07 03:12:15 +03:00
kent@mysql.com
ae62a58817
make_binary_distribution.sh:
...
Corrected platform name output
Services.cpp:
Dont print null address (back port from 5.0)
2005-10-07 01:56:11 +02:00
kent@mysql.com
87016b438c
make_binary_distribution.sh:
...
Reintroduced --machine
Better sh compatibility, "for i ; do" is not portable
2005-10-06 22:57:13 +02:00
dean@mysql.com
59e35d6253
Merge mysql.com:/home/dellis/mysqlab/bk/local_mysql-4.1
...
into mysql.com:/home/dellis/mysqlab/bk/mysql-5.0
2005-10-06 15:52:01 -05:00
dean@mysql.com
dd241c4b8e
Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dellis/mysqlab/bk/mysql-4.1
2005-10-06 15:42:35 -05:00
tomas@poseidon.ndb.mysql.com
38fd830f9e
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-10-06 22:29:31 +02:00
tomas@poseidon.ndb.mysql.com
f9012d58be
ndbd exit code update after review
2005-10-06 22:23:35 +02:00
jani@ua141d10.elisa.omakaista.fi
8c2ab38c38
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-10-06 22:10:03 +03:00
jani@ua141d10.elisa.omakaista.fi
770b9ef34d
Fixed a bug in argument sending to get_one_option.
...
Fixed documentation for findopt().
Cleaned code a bit.
2005-10-06 22:09:15 +03:00
serg@serg.mylan
b05a6d8fda
don't "init" binlog if opt_bin_log is not set
...
(bug#13791 - mysqld crashes at startup in TC_LOG_MMAP::open)
2005-10-06 19:05:34 +02:00
kent@mysql.com
52181cc810
make_binary_distribution.sh:
...
Replaced --machine with --platform
General code cleanup
2005-10-06 18:00:23 +02:00
gluh@mysql.com
a67fcc4669
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Bugs/4.1.13605
2005-10-06 19:58:51 +05:00
monty@mysql.com
78e828d32f
Review of code pushed since last 5.0 pull:
...
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code
2005-10-06 17:54:43 +03:00
gluh@eagle.intranet.mysql.r18.ru
fbc621e545
Fix for bug#13605 'rpl_openssl' test hangs
2005-10-06 19:51:08 +05:00
kent@mysql.com
5e204d46f1
Merge
2005-10-06 15:42:50 +02:00
msvensson@msdesk.(none)
5da6a6c8a1
Merge msdesk.(none):/home/msvensson/mysql-4.1
...
into msdesk.(none):/home/msvensson/mysql-5.0
2005-10-06 14:40:18 +02:00
bar@mysql.com
905c8b8c88
item_cmpfunc.cc:
...
Wrong variable.
2005-10-06 15:26:59 +05:00
tomas@poseidon.ndb.mysql.com
99d1d975d0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-10-06 10:59:58 +02:00
pekka@mysql.com
45dcaf968d
ndb - prelim perl scripts to autotest
2005-10-06 09:44:25 +02:00
kent@mysql.com
3af12c4776
my_pthread.h:
...
Let pthread_mutex_init() macro return 0 on Windows
mysql_priv.h:
Return type is to be 'my_bool' for 'opt_enable_shared_memory'
2005-10-06 03:49:14 +02:00
serg@serg.mylan
9077ee4407
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-05 22:07:04 +02:00
serg@serg.mylan
2d11bbdb21
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-05 20:11:24 +02:00
serg@serg.mylan
2356401750
Bug#12935 Local and XA transactions not mutually exclusive
2005-10-05 19:58:16 +02:00
serg@serg.mylan
faa0365d29
Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-05 19:37:02 +02:00
serg@mysql.com
83683bb649
sql_table.cc:
...
fixed CHECKSUM TABLE to be independent from the first 'deleted' bit in the null bitmask (undefined in the InnoDB)
bug#13710
2005-10-05 19:36:20 +02:00
jimw@mysql.com
83330214e2
Merge mysql.com:/home/jimw/my/mysql-5.0-13071
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-05 10:07:04 -07:00
jimw@mysql.com
6b476cf5cd
Fail when two messages exist for the same language for an error in the
...
server error messages file. (Bug #13071 )
2005-10-05 10:06:31 -07:00
pem@mysql.com
5640d19432
Fixed BUG#13616: "CALL <dbname>.<procedurename>" executes properly, but
...
displays error
When returning to the old database (which may be ""), don't do
access check - mysql_change_db() would then generate the error
"No database selected".
Note: No test case added; it seems a db is always selected when running
tests.
2005-10-05 16:39:37 +02:00
serg@serg.mylan
10953a6d8c
Bug#13143 - formatID should not affect XID's uniqueness
2005-10-05 16:38:53 +02:00
tomas@poseidon.ndb.mysql.com
cdab2c9392
Bug #11749 No message slogan found for Signal 8 received. (need better message)
...
+ revised error messages after feedback
+ revides classifications and status
+ removed all progError(..0..) to make sure all error invocations have an error code
+ added some new error codes to replace some generic usage of SYSTEM_ERROR
+ removed some unused codes
2005-10-05 16:35:28 +02:00
msvensson@neptunus.(none)
debff3e632
Revert
2005-10-05 14:37:42 +02:00
bar@mysql.com
ab2caf6de8
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12476
2005-10-05 17:35:42 +05:00
msvensson@neptunus.(none)
0588cc35f4
Revert
2005-10-05 14:35:41 +02:00