mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21298 commits 2788 branches 343 tags 1.7 GiB
Commit graph

21298 commits

This branch
This branch
All branches
Author SHA1 Message Date
jimw@mysql.com
3ef3c59ed0 Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if 
the row type is dynamic (For 4.1 tables old 'VARCHAR' fields are converted to
true VARCHAR in the next ALTER TABLE)
      
This ensures that one can use MySQL 5.0 privilege tables with MySQL 4.1.

(Fix imported from main 5.0 tree to 5.0.3 build tree.)
 2005-03-22 21:52:01 +01:00
jimw@mysql.com
df015d61d6 Merge mysql.com:/data0/mysqldev/my/mysql-5.0-build 
into mysql.com:/data0/mysqldev/jimw/mysql-5.0-build
 2005-03-22 20:02:53 +01:00
mysqldev@mysql.com
45b810c8a7 Merge 2005-03-22 15:55:24 +01:00
mysqldev@mysql.com
ad26a667e6 sql_acl.cc, sql_acl.h, sql_parse.cc 
New privilege CREATE USER (CREATE_USER_ACL, Create_user_priv) added
grant2.test:
  new tests (mostly backported from jani's patch)
system_mysql_db.result, sp.result, grant2.result, grant.result:
  results updated
 2005-03-22 15:54:18 +01:00
kent@mysql.com
466d3bff25 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
 2005-03-22 15:14:40 +01:00
kent@mysql.com
f3d284c8bc mysql-test-run.sh, mysql-test-run.pl: 
InnoDB needs longer start time for second slave on slow hosts
 2005-03-22 15:12:05 +01:00
joerg@mysql.com
4fd932b772 Revert the inclusion of 'signal.h' as the module contains 'kill()'. 2005-03-22 10:39:26 +01:00
jimw@mysql.com
dd39350074 Merge jwinstead@production.mysql.com:mysql-5.0-build 
into mysql.com:/data0/mysqldev/jimw/mysql-5.0-build
 2005-03-22 02:06:34 +01:00
petr@mysql.com
b072eaa3da Fix for AIX compilation failure: sacred knowledge of my_global.h nature (it should be 
included before any other include) was hidden from me.
 2005-03-22 02:04:14 +03:00
jimw@mysql.com
4c67678f15 Fix Windows compile warnings, declarations of walk functions 2005-03-22 00:00:24 +01:00
jimw@mysql.com
7b985df2a0 Remove references to no-longer-used MySqlManager project files 2005-03-21 23:32:27 +01:00
jimw@mysql.com
5f715b52d0 Fix test_libmysqld link problem on Windows. 2005-03-21 21:51:31 +01:00
kent@mysql.com
4959ed7618 configure.in: 
5.0.3 is a beta
 2005-03-21 19:10:02 +01:00
kent@mysql.com
08cbebc28e Merge mysqldev@production.mysql.com:my/mysql-5.0-build 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
 2005-03-21 16:40:52 +01:00
kent@mysql.com
7d9d95cee6 init_db.sql: 
Added 'proc' and 'procs_priv' tables, updated others
 2005-03-21 16:37:19 +01:00
kent@mysql.com
e25cc0f061 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
 2005-03-21 16:34:30 +01:00
joerg@mysql.com
d9354fb8a6 Code cleanup: should use 'element_count' here, see include/my_tree.h 
(Change done by Ramil and sent via IRC)
 2005-03-21 16:31:15 +01:00
kent@mysql.com
c3fa95d467 mtr_report.pl: 
Made --timer work
mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log
 2005-03-21 16:01:39 +01:00
dlenev@mysql.com
701a7c4875 Merge mysqldev@production.mysql.com:my/mysql-5.0-build 
into mysql.com:/home/dlenev/src/mysql-5.0-build
 2005-03-21 11:15:37 +03:00
patg@krsna.
0ae33dfd36 Federated Storage Handler - test and result fix. 2005-03-20 23:17:35 -08:00
dlenev@brandersnatch.localdomain
c87912c8da Fix for spurious failures of sp.test on many platforms (aka Bug #9161 
"Warnings on 'drop procedure' platform-specific").

In mysqltest we should not issue "SHOW WARNINGS" until we have not 
read results from all statements in multi-statement.

Otherwise such "SHOW WARNINGS" will either cause "Packets out of order"
error and thus will ruin current connection (but we may not notice this as
it happened in sp.test because we ignore errors from such auxilary
SHOW WARNINGS and use auto-reconnecting connections) or will
succeed but consume first packet from next statement in multi-statement
sequence (this happens if "SHOW WARNINGS" is issued when this packet
is already received by client. Packet is thrown away by net_clear()
call which is issued when "SHOW WARNINGS" is sent to server).

In our case sp.test failed because usually we had first situation
but sometimes second situation occured causing warning to pop-up.
 2005-03-20 20:29:03 +03:00
joerg@mysql.com
eeb42a8d38 Import Heikki's patch which was applied to the main tree only. 2005-03-20 14:38:51 +01:00
jimw@mysql.com
31ecea8a0f Manually import InnoDB fix into build tree. 2005-03-18 16:18:06 -08:00
jimw@mysql.com
146994ed4c Fix 'kill' test to actually test that the connection has 
been killed.
 2005-03-18 16:17:10 -08:00
jimw@mysql.com
7de90716b0 Fix Windows compile errors. 2005-03-18 16:15:33 -08:00
jimw@mysql.com
954ef465bc Removed MyISAM RAID from the Linux "Max" RPMs 
(patch from lenz, reapplied by jimw)
 2005-03-18 16:14:49 -08:00
jimw@mysql.com
ee2b4ec959 Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826)
 2005-03-18 16:12:25 -08:00
kent@mysql.com
348c285d0f mysql-test-run.sh: 
Disabled old feature to disable test cases
 2005-03-18 16:48:18 +01:00
joerg@mysql.com
cbba326273 Merge mysqldev@production.mysql.com:my/mysql-5.0-build 
into mysql.com:/M50/build-5.0.3
 2005-03-18 15:43:11 +01:00
joerg@mysql.com
a485a10d46 Merge 2005-03-18 12:54:24 +01:00
joerg@mysql.com
e0d948922b Move mis-placed assignments to their proper position. 2005-03-18 12:44:40 +01:00
jimw@mysql.com
7214c51e72 Merge mysqldev@production.mysql.com:my/mysql-5.0-build 
into mysql.com:/home/jimw/my/mysql-5.0-build
 2005-03-17 17:24:47 -08:00
jimw@mysql.com
dcd336d79d Fix merge of sql/sql_select.cc using Igor's patch (Bug #9254) 2005-03-17 17:22:40 -08:00
lenz@mysql.com
ac5cdb6125 - fixed two merge errors 2005-03-18 00:30:20 +01:00
mysqldev@mysql.com
c59e0fc78b Merge 2005-03-17 22:17:37 +01:00
mysqldev@mysql.com
7d5c7f5ec6 sp.test, sp.result: 
transactional test removed
sp_trans.test, sp_trans.result:
  new file
 2005-03-17 22:15:23 +01:00
jimw@mysql.com
fec41395fb Merge mysql.com:/home/jimw/my/mysql-5.0-8047 
into mysql.com:/home/jimw/my/mysql-5.0-build
 2005-03-17 12:29:30 -08:00
jimw@mysql.com
0fc802a316 Merge mysql.com:/home/jimw/my/mysql-5.0-8679 
into mysql.com:/home/jimw/my/mysql-5.0-build
 2005-03-17 11:14:35 -08:00
jimw@mysql.com
22e5d9cc0a Fix HP/UX debug compile error. (Bug #8679) 2005-03-17 10:27:23 -08:00
jimw@mysql.com
d5b7909448 Merge mysqldev@production.mysql.com:my/mysql-5.0-build 
into mysql.com:/home/jimw/my/mysql-5.0-build
 2005-03-17 10:00:45 -08:00
lenz@mysql.com
4ca5b3c73b - Added a missing pair of parenthesis. (already commited by Jani, ChangeSet@1.1819) 2005-03-17 18:49:48 +01:00
jimw@mysql.com
3828b47807 Merge mysql.com:/home/jimw/my/mysql-5.0-8866 
into mysql.com:/home/jimw/my/mysql-5.0-build
 2005-03-17 08:26:12 -08:00
joerg@mysql.com
3ea0d8806d Manual merge. 2005-03-17 16:44:25 +01:00
gluh@gluh.mysql.r18.ru
edb4dd5366 after merge fix 2005-03-17 18:44:24 +03:00
gluh@gluh.mysql.r18.ru
b435d6e862 Merge 4.1 -> 5.0 2005-03-17 16:51:07 +03:00
gluh@gluh.mysql.r18.ru
08b2c7ecca Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-03-17 13:25:19 +03:00
gluh@gluh.mysql.r18.ru
84cb408445 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-03-17 11:02:11 +03:00
serg@serg.mylan
41997cf263 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-17 08:46:48 +01:00
ramil@mysql.com
261105a007 Merge 2005-03-17 10:59:25 +04:00
ramil@mysql.com
a773916238 A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop). 2005-03-17 10:24:50 +04:00