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
19234 commits 2791 branches 343 tags 1.7 GiB
Commit graph

19234 commits

This branch
This branch
All branches
Author SHA1 Message Date
hf@deer.(none)
bded7c984b Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.9645
 2005-08-22 18:24:17 +05:00
evgen@moonbone.local
3831bb56df Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/11718-bug-4.1-mysql
 2005-08-22 15:46:14 +04:00
jonas@eel.(none)
05fdd166f0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-22 13:35:00 +02:00
joerg@mysql.com
ddcbf609c4 Ensure that a failing test does not stop testing or the whole RPM build process. 2005-08-22 12:48:01 +02:00
hf@deer.(none)
45b07fd422 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.9645
 2005-08-22 13:08:44 +05:00
jonas@eel.(none)
a58c0e7dae Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-21 16:35:27 +02:00
elliot@mysql.com
d9e3ad09e5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
 2005-08-20 22:33:45 -04:00
sasha@asksasha.com
e038bfe8ff Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
 2005-08-20 16:09:59 -06:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
5340e04661 Bug #12460 Table Full 
On 64 bit platforms the changed statement doesn't work
so making sure that the larger value is first and using
subtraction is a quick and backwards-compatible fix of this
line.
 2005-08-20 10:07:46 -04:00
igor@rurik.mysql.com
2c2f18b98b Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-08-19 15:07:51 -07:00
elliot@mysql.com
bbbb56df8f Fix ctype_cp932 test to be deterministic on different machines. 2005-08-19 17:55:28 -04:00
patg@radha.local
7a43a0f54d Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  radha.local:/Users/patg/mysql-build/mysql-4.1.clean
 2005-08-19 23:44:40 +02:00
igor@rurik.mysql.com
55fd68ccd7 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-08-19 12:10:34 -07:00
elliot@mysql.com
d9efe655ed Bug#11338 Fixes from review (identical functionality). 2005-08-19 14:49:34 -04:00
igor@rurik.mysql.com
2d32b77693 distinct.test, distinct.result: 
Added test cases for bug #12625.
sql_select.cc:
  Fixed bug #12625.
  Fixed invalid removal of constant items from the DISTINCT
  list in the function create_distinct_group.
 2005-08-19 01:57:22 -07:00
jonas@eel.(none)
3aede000a2 Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-19 10:13:35 +02:00
jonas@eel.(none)
bf835c89c2 ndb - 
remove grep from Makefile
 2005-08-19 10:12:44 +02:00
jonas@eel.(none)
24be1c1524 jonas - 
Fix checkout properties
 2005-08-19 09:04:30 +02:00
jonas@eel.(none)
178a76fab4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-19 07:58:54 +02:00
jonas@eel.(none)
290cfe313c Merge eel.(none):/home/jonas/src/mysql-4.1-push 
into  eel.(none):/home/jonas/src/mysql-4.1
 2005-08-19 07:51:47 +02:00
patg@radha.local
d0767dfad3 BUG #12498 Fixed mispelling 2005-08-19 07:51:22 +02:00
jonas@eel.(none)
523039c832 ndb 
rename config.cpp -> ndb_config.cpp for case insesitive filesystems
why wasn't this done in 4.1 directly
 2005-08-19 07:48:59 +02:00
sasha@asksasha.com
c594ab7921 updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication). 
We binlog the DROP TABLE for each table that was actually dropped. Per Sergei's 
suggestion a fixed buffer for the DROP TABLE query is pre-allocated from THD pool, and 
logging now is done in batches - new batch is started if the buffer becomes full.
Reduced memory usage by reusing the table list instead of accumulating a list of 
dropped table names. Also fixed the problem if the table was not actually dropped, eg
due to permissions. Extended the test case to make sure batched query 
logging does work.
 2005-08-18 21:40:14 -06:00
jani@a193-229-222-105.elisa-laajakaista.fi
7c99cf1af0 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2005-08-18 21:49:46 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
c6ee26ab45 Some minor fixes for Netware. These were required after we started building 
against a later version of libc.
 2005-08-18 21:26:25 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
3bfa514655 Changes for Netware. This is needed when building against newer Libc 
than we've used before.
 2005-08-18 21:22:35 +03:00
stewart@mysql.com
fe1b8cbfb8 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
 2005-08-19 00:14:43 +10:00
jonas@eel.(none)
96f719818c Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-18 14:07:31 +02:00
jonas@eel.(none)
3b68047235 bug#12118 - ndb alter table data loss 
Split table version into 2 (major, minor)
  Impl. signaling to API when table has been altered
  Allow running transactions to use any minor number for transactions
 2005-08-18 14:02:25 +02:00
evgen@moonbone.local
6d8bd17c3a Fix bug #11718 query with function, join and order by returns wrong type. 
create_tmp_field_from_item() was creating tmp field without regard to
original field type of Item. This results in wrong type being reported to
client.

To create_tmp_field_from_item() added special handling for Items with 
DATE/TIME field types to preserve their type.
 2005-08-17 23:53:12 +04:00
sasha@asksasha.com
76a59be6fb Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
 2005-08-17 12:39:30 -06:00
reggie@linux.site
6e84ca33d9 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  linux.site:/home/reggie/bk/mysql-4.1
 2005-08-17 07:03:30 -06:00
joerg@mysql.com
09a3d58987 Increase the version number to 4.1.15 (as 4.1.14 has been cloned off). 2005-08-17 15:03:29 +02:00
kent@mysql.com
e1351afcca mysql-test-run.pl, mtr_misc.pl: 
Bug#12615: Host name might not resolve, use short host name
 2005-08-17 14:40:23 +02:00
elliot@mysql.com
1664e31f12 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug11338
 2005-08-17 04:32:29 -04:00
elliot@mysql.com
197782605f BUG#11338 (logging of prepared statement w/ blob type) 
In cp932, '\' character can be the second byte in a 
multi-byte character stream. This makes it difficult to use
mysql_escape_string. Added flag to indicate which languages allow
'\' as second byte of multibyte sequence so that when putting a prepared
statement into the binlog we can decide at runtime whether hex encoding
is really needed.
 2005-08-17 04:26:32 -04:00
kent@mysql.com
16359fc02f mysql-test-run.pl: 
Bug#11884: Corrected --start-and-exit, start the server
  as if the default/specified test case would have been run
 2005-08-17 03:35:50 +02:00
kent@mysql.com
c3104d1af1 mtr_process.pl: 
Bug#11792: Check all of status code, to catch a crash as a failure
mtr_cases.pl:
  Code cleanup for skipped/disabled handling
mtr_process.pl:
  In debug mode, report if mysqladmin did not at least
  make the server stop listening to the port.
  Increased the time waiting for terminating to 20 seconds,
  to wait for really slow slave shutdown.
  Added call to start_reap_all(), to avoid zombies.
mtr_report.pl:
  Removed prototype for unused function mtr_report_test_disabled()
 2005-08-17 01:18:13 +02:00
kent@mysql.com
9457373c5f mtr_process.pl: 
Bug#12094: Let sleep_until_file_created() return the pid as intended
 2005-08-16 19:49:43 +02:00
kent@mysql.com
6ffe45c54e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-08-16 19:00:22 +02:00
stewart@mysql.com
c7a8707f1f Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main 
into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11538
 2005-08-16 18:33:04 +10:00
igor@rurik.mysql.com
d553e16518 subselect.result: 
Added missing drop statement
subselect.test:
  Added missing drop statement.
 2005-08-15 21:43:46 -07:00
igor@rurik.mysql.com
9693dc6a6b sql_select.cc: 
Fixed bug #11479.
  The JOIN::reinit method cannot call setup_tables
  after the optimization phase since this function
  removes some optimization settings for joined
  tables. E.g. it resets values of the null_row flag to 0.
subselect.result, subselect.test:
  Added a test case for bug #11479.
 2005-08-15 21:33:58 -07:00
jimw@mysql.com
cd0f3596be Merge mysql.com:/home/jimw/my/mysql-4.1-11688 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-15 10:18:14 -07:00
jimw@mysql.com
233745a902 Merge mysql.com:/home/jimw/my/mysql-4.1-12235 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-15 10:03:36 -07:00
jimw@mysql.com
df25928983 Merge mysql.com:/home/jimw/my/mysql-4.1-11796 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-15 09:59:11 -07:00
jimw@mysql.com
e21a025c65 Merge mysql.com:/home/jimw/my/mysql-4.1-12327 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-15 09:58:05 -07:00
lars@mysql.com
b6a65715d6 BUG#12542: Prevous patch was incorrect. This removed the patch. 2005-08-15 17:53:38 +02:00
bell@50.0.168.192.in-addr.arpa
8d7a364074 Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 
into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
 2005-08-13 07:49:22 +03:00
bell@50.0.168.192.in-addr.arpa
c96bedb745 Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 
into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
 2005-08-13 07:46:06 +03:00