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

7994 commits

Author SHA1 Message Date
jonas@eel.(none)
6399a93ac2 Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-5.0
 2005-08-18 14:25:00 +02: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
petr@mysql.com
cb71626268 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usersnfs/pchardin/mysql-5.0
 2005-08-18 11:25:32 +02:00
petr@mysql.com
4fb6f4dddf Fix for Bug#11247 Stored procedures: Function calls in long loops leak memory 
and Bug#12297 SP crashes the server if data inserted inside a lon loop
Third commit attempt. With fixes to the issues, showed up after full rebuild and
tests on other hosts.
 2005-08-18 11:23:54 +02:00
bell@sanja.is.com.ua
fc070c2bcb stop on NULL comparison only if it is allowed (BUG#12509) 2005-08-18 12:07:14 +03:00
igor@rurik.mysql.com
fd5461ac12 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-17 22:24:20 -07:00
igor@rurik.mysql.com
5ac7d86793 view.test: 
Added a test case for bug #10970.
view.result:
  Added a test case for bug #10970.
  Modified the error messages for error ER_VIEW_SELECT_TMPTABLE.
sql_view.cc:
  Fixed bug #10970.
  In the function mysql_create_view if a view does not refer
  any tables directly the variable table must be updated
  after the call of open_and_lock_tables.
errmsg.txt:
  Modified the error messages for error ER_VIEW_SELECT_TMPTABLE
  (when fixing bug #10970).
 2005-08-17 22:19:12 -07:00
jimw@mysql.com
15f97778ff Revert patch for Bug #12595, it causes the sql_mode test to fail. 2005-08-17 19:56:14 -07:00
monty@mysql.com
c726451abb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-08-18 03:41:11 +03:00
monty@mysql.com
3eaa953529 Cleanups and optimization during review of new code 2005-08-18 03:12:42 +03:00
kent@mysql.com
1476a52433 mtr_timer.pl, mysql-test-run.pl, mtr_report.pl, mtr_process.pl: 
Added suite and test case timeout
mtr_timer.pl:
  new file
 2005-08-18 00:16:44 +02:00
kent@mysql.com
adb94df296 mtr_process.pl: 
Bug#11792: Create a shell like 'mysqltest' exit status
 2005-08-18 00:07:17 +02:00
kent@mysql.com
1dddccb8e9 mtr_process.pl: 
Longer shutdown timeout, slave may be in reconnect
  HUP seem to disturb exit(), added sleep to make sure
  output is flushed
 2005-08-17 23:47:03 +02:00
bell@sanja.is.com.ua
7f48830f9e sql_view.cc: 
correct exit from mysql_create_view to restore ennvironment (BUG#12468)
view.result, view.test:
  test of CRETE VIEW in SP
 2005-08-17 22:42:53 +03: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
andrey@lmy004.
4ff51a5743 fix for bug #12591 (SHOW TABLES FROM dbname produces wrong error message) 2005-08-17 17:51:10 +02:00
aivanov@mysql.com
c3de1aa84a Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-1
 2005-08-17 18:46:20 +04:00
timour@mysql.com
a55786ca70 WL#2486 - natural and using join according to SQL:2003 
- fixed a problem with RIGHT JOIN ON and enabled corresponding tests in select.test
- fixed a memory leak
 2005-08-17 17:19:31 +03: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
osku@127.(none)
3809fdac6d Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-17 11:11:50 +03:00
osku@127.(none)
fb48039444 Fix bug #11946, truncate not always resetting the auto-increment counter 
in InnoDB tables.
 2005-08-17 11:00:20 +03:00
kent@mysql.com
4e4f40e468 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-17 03:39:15 +02: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
32306349a5 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-17 01:26:19 +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
aivanov@mysql.com
df00bbc862 Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-1
 2005-08-16 23:33:06 +04:00
aivanov@mysql.com
ed6cd805dc information_schema.test: 
Added a comment line for a test case used for bug #12301.
information_schema.result:
  Fixed some test cases results (bug #12301).
sql_show.cc:
  Fixed bug #12301.
  The bug was due to a missing value setting for the NUMERIC_SCALE column
   in the get_schema_column_record() function (sql_show.cc).
 2005-08-16 23:11:04 +04:00
andrey@lmy004.
41c93e368b Merge lmy004.:/work/mysql-5.0-clean 
into lmy004.:/work/mysql-5.0-bug12595
 2005-08-16 20:59:18 +02:00
evgen@moonbone.local
eb6135a765 Fix bug #11398 Bug in field_conv() results in wrong result of join with index 
When copying varchar fields with field_conv() it's not taken into account
that length_bytes of source and destination fields may be different.
This results in saving wrong data in field and making wrong key later.

Added check so if fields are varchar and have different length_bytes they
are not copied by memcpy().
 2005-08-16 22:13:43 +04:00
kent@mysql.com
cb03a7b821 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-16 19:53:39 +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
msvensson@neptunus.(none)
9ed35f83fa BUG#10267 mysqltest, wrong number of loops when a script is sourced within a loop 2005-08-16 17:10:52 +02:00
andrey@lmy004.
a7a762e27d fix for bug #12595 (Escape character has to be exactly one) 2005-08-16 15:39:40 +02:00
andrey@lmy004.wdf.sap.corp
41e7178b77 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.wdf.sap.corp:/work/mysql-5.0-clean
 2005-08-16 11:22:29 +02:00
andrey@lmy004.wdf.sap.corp
c896ca1a10 fix for bug #12183 "SHOW OPEN TABLES behavior doesn't match grammar" 
(after review commit)
 2005-08-16 11:18:35 +02:00
igor@rurik.mysql.com
c5ac7e8d95 Manual merge 2005-08-15 21:58:17 -07: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
68d5420d7c Clean up merge from 4.1 2005-08-15 14:19:56 -07:00
jimw@mysql.com
2d34276417 Merge mysql.com:/home/jimw/my/mysql-5.0-12318 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-15 12:39:36 -07:00
jimw@mysql.com
55eebfb776 Merge mysql.com:/home/jimw/my/mysql-5.0-10627 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-15 12:38:56 -07:00
jimw@mysql.com
a3eaf4eec2 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-15 12:37:45 -07:00
evgen@moonbone.local
69319f17e7 Fix bug #10624 Views with multiple UNION and UNION ALL produce incorrect 
results.

st_select_lex_unit::print() was losing UNION ALL if in statement were present
UNION DISTINCT.
 2005-08-15 23:05:05 +04: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
monty@mysql.com
8589f14d45 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-08-15 20:12:28 +03:00
monty@mysql.com
c10f05552f Don't clear warnings for functions or triggers 
Fixed failing test
 2005-08-15 20:08:58 +03:00
acurtis@xiphis.org
c414bb1520 Bug#12518 
"COLUMN_DEFAULT has wrong value if NOT NULL is set"
  Show NULL instead of empty string when no default value is set
 2005-08-15 17:14:55 +01:00
monty@mysql.com
1a6f16edd9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-08-15 18:35:48 +03:00
monty@mysql.com
d0c66bbaa3 Fixed typo in error numbers 2005-08-15 18:29:51 +03:00