Commit graph

19203 commits

Author SHA1 Message Date
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
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
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
bell@50.0.168.192.in-addr.arpa
1e248ceaf1 fixed convertion and handling IN subqueries with rows (BUG#11867) 2005-08-13 07:45:14 +03:00
tsmith@.mysql.com
9097bd2f08 sql_parse.cc:
Don't skip SET command even if --replicate-wild* says to.
  E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)
2005-08-13 05:08:29 +02:00
jimw@mysql.com
f693d22bb1 Make sure to clean up temporary files in myisampack even when the
-T option is used. (Bug #12235)
2005-08-12 11:44:25 -07:00
lenz@mysql.com
acaad2c70b Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-merge
2005-08-12 14:44:16 +02:00
lenz@mysql.com
61a9bace12 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-merge
2005-08-12 14:44:03 +02:00
reggie@linux.site
869869fa0c Bug #6581 Failure to start mysql server on Windows with AWE option enabled 2005-08-12 04:44:04 -06:00
bar@mysql.com
fd7ad7f16f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b12351
2005-08-12 15:44:03 +05:00
lenz@mysql.com
8a72ee556d Merge mysql.com:/space/my/mysql-4.0-merge
into mysql.com:/space/my/mysql-4.1-merge
2005-08-12 08:13:02 +02:00
patg@radha.local
15ba37d438 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  radha.local:/Users/patg/mysql-build/mysql-4.1.clean
2005-08-12 03:34:57 +02:00
lenz@mysql.com
16b696a60e - another comment typo fixed 2005-08-11 21:18:45 +02:00
lenz@mysql.com
c1c336f84b - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
preflight/postflight instead, so they are run every time a PKG is installed, not only for
  a fresh installation
2005-08-11 20:23:12 +02:00
lenz@mysql.com
776bf91371 - Make sure the Mac OS X support files are built, but not installed by "make install" (the previous
change was too drastic) (BUG#12506)
2005-08-11 20:13:12 +02:00
kent@mysql.com
fd4880814c Makefile.am:
config.cpp => ndb_config.cpp, solves link problems on case insensitive OS
ndb_config.cpp:
  Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp
2005-08-11 13:47:24 +02:00
sanja@arthur.local
3b64651683 query_cache_notembedded.test, query_cache_notembedded.result:
postmerge fix
2005-08-11 13:07:08 +03:00
bell@51.0.168.192.in-addr.arpa
4f26fa5184 merge 2005-08-11 10:20:06 +03:00
bell@51.0.168.192.in-addr.arpa
66a055b4d6 make the same filenames as in 4.1 2005-08-11 09:29:50 +03:00
jimw@mysql.com
078e0c3902 Fix mysql_info() returning bad data in the results of a multi-statement
query that mixed statements that do and do not return info. (Bug #11688)
2005-08-10 18:32:17 -07:00
patg@radha.local
8c83f14b76 BUG #12253. Fixed logic the prevented repair when "--fast" was included
in invoking mysqlcheck.
2005-08-10 23:37:17 +02:00
bell@52.0.168.192.in-addr.arpa
1dff783854 block using QC in case of having tables locked by LOCK... (BUG#12385) 2005-08-10 18:58:55 +03:00
mskold@mysql.com
978d67a9ea Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-08-10 09:52:58 +02:00
mskold@mysql.com
7ccf9b9708 Added support for ha_ndbcluster::info(HA_STATUS_AUTO) 2005-08-10 09:38:36 +02:00
jimw@mysql.com
194360397c Rename rest() macro in my_list.h to list_rest(). (Bug #12327) 2005-08-09 18:02:36 -07:00
acurtis@xiphis.org
aa99bd61c0 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into  xiphis.org:/usr/home/antony/work2/p2-bug10109.3
2005-08-09 16:35:51 +01:00
bar@mysql.com
a856f155c6 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b5439
2005-08-09 09:07:12 +05:00
jimw@mysql.com
d6a8330e39 Avoid problems on shutdown by shutting down replication slave threads
after normal connection threads. (Bug #11796)
2005-08-08 18:05:27 -07:00
igor@rurik.mysql.com
253883803b Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-08-08 16:55:29 -07:00