Commit graph

21484 commits

Author SHA1 Message Date
gbichot@production.mysql.com
ac47ee1808 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
2005-03-22 01:32:24 +01:00
gbichot@production.mysql.com
56495a3691 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
2005-03-22 00:28:33 +01:00
gbichot@production.mysql.com
c766efdc5d Last part of WL#1062: better replication of timezones: no more use
of SET ONE_SHOT; storing tz info directly in event (if this info is needed),
it's now allowed to have different global tz on master and slave.
2005-03-22 00:26:12 +01:00
petr@mysql.com
b10b7017fc Merge mysql.com:/home/cps/mysql/devel/im-failure-fix
into mysql.com:/home/cps/mysql/devel/merge-5.0
2005-03-22 02:22:48 +03: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
monty@mysql.com
d8b078e423 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-03-21 23:46:11 +02:00
monty@mysql.com
a1ab786091 Cleanups during review of code
Fixed newly introduced bug in rollup
2005-03-21 23:41:28 +02:00
jimw@mysql.com
5f715b52d0 Fix test_libmysqld link problem on Windows. 2005-03-21 21:51:31 +01:00
heikki@hundin.mysql.fi
2aa44dd98d Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-03-21 22:29:02 +02:00
heikki@hundin.mysql.fi
8a906d79aa trx0trx.c:
If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
2005-03-21 22:21:55 +02:00
heikki@hundin.mysql.fi
177e7b7f47 Merge 2005-03-21 22:14:00 +02:00
heikki@hundin.mysql.fi
3f378c5232 trx0trx.c, trx0trx.h:
If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
2005-03-21 22:10:42 +02:00
kent@mysql.com
50a823df70 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-03-21 19:17:18 +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
61ef715e35 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-21 17:46:20 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
a34ee2c900 A fix for Netware. 2005-03-21 18:11:11 +02:00
kent@mysql.com
82b219d1a1 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-03-21 17:08:00 +01:00
joerg@mysql.com
86574f4836 Merge mysql.com:/M50/build-5.0.3 into mysql.com:/M50/push-5.0 2005-03-21 16:46:11 +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
konstantin@mysql.com
d5af61b1a0 Rename decimal -> decimal_t, decimal_digit -> decimal_digit_t 2005-03-21 15:58:34 +03:00
serg@serg.mylan
f4d4df2ca4 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-21 13:43:25 +01:00
dlenev@mysql.com
752a787342 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-03-21 13:28:48 +03:00
msvensson@neptunus.(none)
a5bb4810ff BUG#9072 'Max_error_count' system variable cannot be set to zero
- Chaned min value in mysqld.cc
 - Added testcase to warnings.test
2005-03-21 11:07:31 +01:00
konstantin@mysql.com
3e8045c662 Fix a valgrind warning in decimal.c:sanity() 2005-03-21 12:57:42 +03:00
dlenev@mysql.com
ea8adbff36 Manual merge of csets from -build tree into main 5.0 tree. 2005-03-21 11:39:47 +03: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
igor@rurik.mysql.com
df12e29955 func_group.test, func_group.result:
Added a test case for bug #9210.
sql_select.cc:
  Fixed bug #9210.
  The function calc_group_buffer did not cover the case
  when the GROUP BY expression was decimal.
  Slightly optimized the other code.
2005-03-19 23:12:50 -08:00
konstantin@mysql.com
947065ddab Clean up the warning inside sanity():decimal.c in valgrind-max builds. 2005-03-19 18:39:26 +03:00
konstantin@mysql.com
8ed6b8f82c Cleanup, remove some -ansi -pedancit warnings (mysql_client_test.c) 2005-03-19 18:16:38 +03: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
serg@serg.mylan
da27256e12 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-18 20:12:31 +01:00
heikki@hundin.mysql.fi
ecc3a17457 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-03-18 19:33:41 +02:00
heikki@hundin.mysql.fi
544fb39894 data0type.h:
The missing DATA_BINARY_TYPE in BLOBs created with < 4.0.14 does not cause any harm, because there were no indexes on such BLOBs
2005-03-18 19:16:11 +02:00
heikki@hundin.mysql.fi
c163b6831e data0type.ic:
Change the sorting order of TEXT columns in InnoDB: pad with spaces at the end in comparisons; we MUST UPDATE the MySQL MANUAL to warn about the need to rebuild tables (also MyISAM) in certain cases in an upgrade to 5.0.3; TODO: study what complications the missing DATA_BINARY_TYPE flag in InnoDB < 4.0.14 causes: we would compare then also BLOBs with space padding, not just TEXT
2005-03-18 19:09:22 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
4ef20658d7 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-03-18 19:04:09 +02:00
heikki@hundin.mysql.fi
3ee989b2be Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-03-18 18:56:23 +02:00
lenz@mysql.com
37a9ce4420 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-03-18 17:36:54 +01:00