Commit graph

38170 commits

Author SHA1 Message Date
brian@zim.(none)
46ae2113ba This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).
Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call.
2006-09-30 12:49:46 -07:00
brian@zim.(none)
a756fd36ef This removes the passing of global hton to engine instance. 2006-09-29 17:19:02 -07:00
brian@zim.(none)
4bce203fdf Merge zim.(none):/home/brian/mysql/merge-5.1
into  zim.(none):/home/brian/mysql/arch-5.1
2006-09-26 22:51:53 -07:00
brian@zim.(none)
f9a02811da Removed Field (this came in as an idea from a previous patch by Serg) 2006-09-26 21:26:04 -07:00
brian@zim.(none)
8b80901dcf Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into  zim.(none):/home/brian/mysql/merge-5.1
2006-09-23 18:03:35 -07:00
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e826f7490e mysql.spec.sh:
Added "test" RPM package
  Install all binaries "make install" would
make_binary_distribution.sh:
  Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)
2006-09-24 00:41:20 +02:00
brian@zim.(none)
0a0f1aa386 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into  zim.(none):/home/brian/mysql/merge-5.1
2006-09-23 12:13:30 -07:00
lars/lthalmann@dl145k.mysql.com
60e178bb73 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1
2006-09-23 08:45:26 +02:00
brian@zim.(none)
97d1b44fc4 Merge zim.(none):/home/brian/mysql/merge-5.1
into  zim.(none):/home/brian/mysql/arch-5.1
2006-09-22 23:35:43 -07:00
brian@zim.(none)
48381342d8 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into  zim.(none):/home/brian/mysql/merge-5.1
2006-09-22 23:33:08 -07:00
brian@zim.(none)
4a3bf4ae84 Required file for next tests (taken from work by JimW in Falcon) 2006-09-22 23:32:47 -07:00
lars/lthalmann@dl145k.mysql.com
bab374162f Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-23 07:54:40 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
7a761a2545 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-23 07:37:41 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
7ce96bb579 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-23 07:12:00 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
80dadacb03 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-23 07:11:32 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
bbbb3901af Disabling test case 2006-09-23 07:07:29 +02:00
lars/lthalmann@dl145h.mysql.com
b8556c82a9 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-23 06:06:06 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
bbf84d6b9e Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-23 06:00:50 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
7e45d80362 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-23 05:58:48 +02:00
mskold/marty@linux.site
5e60232da9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-09-22 21:14:58 +02:00
joerg@trift2.
4525ea4bfb Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M51/push-5.1
2006-09-22 17:24:06 +02:00
georg@lmy002.wdf.sap.corp
67a701003c Fix for bug #19121: Windows incompatible udf_example 2006-09-22 14:42:43 +02:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
724ea113f8 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
2006-09-22 12:39:29 +03:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
0c788a30dd BUG#22067 rpl_rbr_to_sbr and some other fail if NDB is default storage
local file slipped into a previous commit, fixing ignore.
2006-09-22 11:08:47 +03:00
georg@lmy002.wdf.sap.corp
ca00ba4991 Added build rule for mysql_upgrade.exe 2006-09-22 07:38:24 +02:00
joerg@trift2.
17218bd732 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-09-21 20:03:39 +02:00
mats@romeo.(none)
3b9b6e6544 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl
2006-09-21 18:11:35 +02:00
mats@romeo.(none)
f5b8614fc7 BUG#22550 (Replication of BIT column failing):
Using move_field_offset() to move field pointer to other record before
calling pack()/unpack().
2006-09-21 18:05:02 +02:00
joerg@trift2.
d1f0a57a6d Add a dummy file for "Docs/manual.chm" as we need it for "make dist" to work. 2006-09-21 17:38:42 +02:00
istruewing@chilla.local
64fbabc551 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-toteam
2006-09-21 17:18:20 +02:00
joerg@trift2.
3acb6778dd Merge trift2.:/MySQL/M50/extract1-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-09-21 16:48:31 +02:00
georg@lmy002.wdf.sap.corp
8a7875fd53 added udf_example.def for make dist 2006-09-21 15:56:14 +02:00
georg@lmy002.wdf.sap.corp
f4af1d8283 Windows 64bit fixes
Fixed udf_example, so tests now can also run udf on win.
2006-09-21 15:19:20 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
4f5e3b3dee After merge fixes 2006-09-21 14:19:17 +02:00
lars/lthalmann@dl145k.mysql.com
2ec2300759 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-21 13:54:57 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
738cd74b52 After merge fixes 2006-09-21 13:38:01 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
2c5dc57e27 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-21 13:28:16 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
9538acf5dc Adding proper setup phase for test case rpl_insert_id 2006-09-21 13:19:52 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
c34601adec If mysqlslap schema does not exists, it should be an error, so no need for IF EXISTS
Setting default database back to 'test', so that next test case don't use the wrong database
2006-09-21 13:04:33 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
588ab714ff Added master-slave synchronization to make sure truncate happen before slave manipulations on every platform 2006-09-21 11:45:16 +02:00
istruewing@chilla.local
f083782c42 Merge chilla.local:/home/mydev/mysql-5.0--main
into  chilla.local:/home/mydev/mysql-5.0-toteam
2006-09-21 10:55:23 +02:00
grichter@bk-internal.mysql.com
7f4cd7864f Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-win
2006-09-21 09:58:23 +02:00
istruewing@chilla.local
0aaf483734 Merge chilla.local:/home/mydev/mysql-5.1--main
into  chilla.local:/home/mydev/mysql-5.1-tomain
2006-09-21 09:37:31 +02:00
georg@lmy002.wdf.sap.corp
b17bbb9d3e Deleted old storage directories (introduced by a buggy 5.0 -> 5.1 merge).
Fix for win/Makefile.am
2006-09-21 08:57:47 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
fe782f92d6 Vertical printout in test to make easier to read 2006-09-21 03:32:42 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
00ba129e51 Version 5.1 needs one connection less 2006-09-21 02:44:58 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
bc8207c9b8 Result file fixes after merge 2006-09-21 02:39:47 +02:00
lars/lthalmann@dl145j.mysql.com
a397c1805c Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-21 01:15:28 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
95d0ae96b2 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-21 01:01:38 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
6aded45614 Fix of result files from merge 2006-09-21 00:59:48 +02:00