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

49510 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@pilot.(none)
e10fb4ffb3 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-29 11:55:03 +02:00
msvensson@pilot.(none)
bce2f6bba8 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-29 11:54:26 +02:00
msvensson@pilot.(none)
044f7a3270 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-29 11:54:21 +02:00
msvensson@pilot.(none)
523cddeec3 Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-29 11:53:36 +02:00
msvensson@pilot.(none)
b68689172f Remove unportable use of "exec chmod" 2007-08-29 11:53:15 +02:00
msvensson@pilot.(none)
387990f78d Add 'mtr_rmtree' 2007-08-29 11:51:34 +02:00
tsmith@ramayana.hindu.god
9410759277 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-28 13:25:06 -06:00
tsmith@ramayana.hindu.god
044cd7b471 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/b27694/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-28 13:24:31 -06:00
msvensson@pilot.(none)
3df9790e41 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-28 16:47:41 +02:00
msvensson@pilot.(none)
4a7087526f Streamline "do_close_connection" and "do_send_quit" 
Fix typo, "next_con" -> "con"
 2007-08-28 16:47:05 +02:00
msvensson@pilot.(none)
d11d6ea773 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-28 16:44:51 +02:00
msvensson@pilot.(none)
397fbd0289 Remove unportable constructs in loaddata.test 2007-08-28 16:44:31 +02:00
msvensson@pilot.(none)
dc4d29bf23 Remove unportable construct in loaddata.test 2007-08-28 15:35:42 +02:00
msvensson@pilot.(none)
221dba148e Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-28 15:33:14 +02:00
msvensson@pilot.(none)
440caf3e10 Remove unportable constructs in loaddata.test 2007-08-28 15:32:44 +02:00
msvensson@pilot.(none)
4a013e295d Move "analyze_testcase_failure" to mysqltest(since it knows best when 
to perform this analyzis)
 2007-08-28 15:32:13 +02:00
msvensson@pilot.(none)
26afeffa74 Temp disable of icheck 2007-08-28 12:41:25 +02:00
msvensson@pilot.(none)
ccfbae831f Fix warning 2007-08-28 11:39:29 +02:00
msvensson@pilot.(none)
cae9149d7c Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-28 11:36:10 +02:00
msvensson@pilot.(none)
bce8ea54ff Merge pilot.(none):/data/msvensson/mysql/bug28812/my50-bug28812 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-28 11:35:22 +02:00
msvensson@pilot.(none)
c2b817013c Merge pilot.(none):/data/msvensson/mysql/yassl_import/my50-yassl_import 
into  pilot.(none):/data/msvensson/mysql/bug28812/my50-bug28812
 2007-08-28 11:35:05 +02:00
msvensson@pilot.(none)
ec421a02a9 Bug#28812 rpl_ssl fails due to assert in extra/yassl/src/socket_wrapper.cpp:117 
- Merge sslaccept and sslconnect.
 - Atomically "reset" vio to VIO_TYPE_SSL when the SSL connection has
   succeeded, this avoids having to revert anything and thus protects
   against "close_active_vio" in the middle.
 - Add some variance to the testcase
 2007-08-28 11:34:43 +02:00
msvensson@pilot.(none)
bb4ce6d212 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-28 11:16:26 +02:00
msvensson@pilot.(none)
394d9a0e55 Import yaSSL version 1.7.2 
- Fix bug#27265
- Support for fixing bug#18441
 2007-08-28 10:35:55 +02:00
tsmith@sita.local
b42e80e351 Post-merge fixes 2007-08-28 01:02:57 -06:00
tsmith@ramayana.hindu.god
a009144d43 Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22-X 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-27 18:41:29 -06:00
tsmith@ramayana.hindu.god
6106226f77 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-27 18:23:44 -06:00
tsmith@ramayana.hindu.god
c87236ce91 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-27 18:20:54 -06:00
tsmith@ramayana.hindu.god
86ef148e6c Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-27 18:19:55 -06:00
tsmith@ramayana.hindu.god
2c44def1ee Bug #30389: connection_id() always return 0 in embedded server 
Initialize thd->variables.pseudo_thread_id when a new embedded
thd is created.
 2007-08-27 14:31:27 -06:00
tsmith@ramayana.hindu.god
c0fd09224b Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 
into  ramayana.hindu.god:/home/tsmith/m/bk/51-target22-X
 2007-08-27 14:23:02 -06:00
tsmith@ramayana.hindu.god
7dbef328be Bug #30412 and Bug #30413 
Update some tests in the "parts" suite, so they're skipped if the
requisite plugins are not present in the mysqld.
 2007-08-27 14:12:12 -06:00
tsmith@ramayana.hindu.god
220cd12f0b Fixes for the following bugs: 
Bug #30316: Some "parts" tests fail because the server uses "--secure-file-priv"
Bug #30341: Test suite "parts" needs to be adapted to the new rules disallowing many functio
Bug #30408: Suite "parts" needs bug numbers updated
Bug #30411: Suite "parts" needs bug numbers updated: ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF
Bug #30576: part_supported_sql_func_innodb.test tries to LOAD DATA outside of var dir
Bug #30581: partition_value tests use disallowed CAST() function

Included are some general fixes to allow the "parts" test suite to be run
successfully.  This includes disabling a few tests or parts of tests,
cleaning up the test cases and their results, etc.  Basically, these tests
have not been run for some time, and had suffered some bit rot.

The bugs were fixed as a single changeset, because in some ways they depend
on each other.  I couldn't be sure I'd updated all the error codes (for
bugs 30408 and 30411) without also adapting to the new allowed functions
rules (bug 30341), and vice versa.
 2007-08-27 14:08:32 -06:00
baker@bk-internal.mysql.com
25c467bf6f Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-08-27 20:20:08 +02:00
tsmith@ramayana.hindu.god
549ed88635 Bug #30648: Partition handler may not initialize variable used w/ autoincrement 
A local variable may be used uninitialized in 
ha_partition::get_auto_increment().  Initialize it properly.
 2007-08-27 11:46:34 -06:00
tomas@whalegate.ndb.mysql.com
7d23f75534 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
 2007-08-27 15:41:24 +02:00
tomas@whalegate.ndb.mysql.com
e1f827da84 Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue 2007-08-27 15:40:49 +02:00
gkodinov/kgeorge@magare.gmz
7a486b927f Merge bk-internal:/home/bk/mysql-5.1-target-5.1.22 
into  magare.gmz:/home/kgeorge/mysql/work/mysql-5.1-target-5.1.22-joro
 2007-08-27 15:08:55 +03:00
gkodinov/kgeorge@magare.gmz
240e9329e7 portation fixes for bug 29536 and 29325 in 
re-pushing for 5.1.22.
 2007-08-27 15:01:29 +03:00
joerg@trift2.
30fdecb393 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 
into  trift2.:/MySQL/M51/target-5.1.22
 2007-08-27 13:59:32 +02:00
msvensson@pilot.(none)
76de827058 Enable abi_check for 5.1 
- Run icheck on all files in HEADERS_ABI list 
 - Update reference
 2007-08-27 13:55:45 +02:00
joerg@trift2.
cb279c906a Merge trift2.:/MySQL/M51/netware3-5.1 
into  trift2.:/MySQL/M51/target-5.1.22
 2007-08-27 13:53:23 +02:00
msvensson@pilot.(none)
ffc67d70ce Bug#28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE 
- Set sql_mode to default when creating system tables
 2007-08-27 13:39:34 +02:00
joerg@trift2.
e42afa010d More cleanup / fixing for NetWare: 
1) "test_db.sql" is a plaintext file, no binary;
2) do not try to strip the binaries, it will not work.
 2007-08-27 13:30:22 +02:00
msvensson@pilot.(none)
9d1570302b Cset exclude: msvensson@pilot.(none)|ChangeSet|20070827092310|49459 2007-08-27 13:16:39 +02:00
tomas@whalegate.ndb.mysql.com
857a157c3c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
 2007-08-27 13:14:37 +02:00
tomas@whalegate.ndb.mysql.com
c45f5bc691 repair some rpl_ndb test cases 2007-08-27 13:13:00 +02:00
df@pippilotta.erinye.com
0c66cf7bbc Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-08-27 11:40:38 +02:00
df@pippilotta.erinye.com
0670af9479 adjust version number 2007-08-27 11:38:32 +02:00
gkodinov/kgeorge@magare.gmz
424e70353f re-push of Bug 29536 for 5.1.22: timestamp inconsistent in replication around 1970 
MySQL replicates the time zone only when operations that involve
it are performed. This is controlled by a flag. But this flag
is set only on successful operation.
The flag must be set also when there is an error that involves
a timezone (so the master would replicate the error to the slaves).
 2007-08-27 12:33:57 +03:00