summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.blaudden>2007-05-18 12:50:23 +0200
committerunknown <msvensson@pilot.blaudden>2007-05-18 12:50:23 +0200
commit421d8ca9728ff882780599ce36cfa20936c7863e (patch)
tree6461a7a8038cdbc4aad2ed8672d795ff27165075 /client
parentf106d396c0f80297354b8a6a58ab6006c634f467 (diff)
downloadmariadb-git-421d8ca9728ff882780599ce36cfa20936c7863e.tar.gz
WL#2247 mysqltest: add option for sorting results
- Final touchups client/mysqltest.c: Final touch ups, rename sorted_results to sorted_result mysql-test/r/mysqltest.result: Update test result mysql-test/t/mysqltest.test: Update results with additional subtests for empty result set, NULL values and 1024 rows
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index cf4f0e00504..d69ef177fb6 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -271,7 +271,7 @@ enum enum_commands {
Q_EXEC, Q_DELIMITER,
Q_DISABLE_ABORT_ON_ERROR, Q_ENABLE_ABORT_ON_ERROR,
Q_DISPLAY_VERTICAL_RESULTS, Q_DISPLAY_HORIZONTAL_RESULTS,
- Q_QUERY_VERTICAL, Q_QUERY_HORIZONTAL, Q_SORTED_RESULTS,
+ Q_QUERY_VERTICAL, Q_QUERY_HORIZONTAL, Q_SORTED_RESULT,
Q_START_TIMER, Q_END_TIMER,
Q_CHARACTER_SET, Q_DISABLE_PS_PROTOCOL, Q_ENABLE_PS_PROTOCOL,
Q_DISABLE_RECONNECT, Q_ENABLE_RECONNECT,
@@ -341,7 +341,7 @@ const char *command_names[]=
"horizontal_results",
"query_vertical",
"query_horizontal",
- "sorted_results",
+ "sorted_result",
"start_timer",
"end_timer",
"character_set",
@@ -6161,7 +6161,7 @@ int main(int argc, char **argv)
case Q_DISPLAY_HORIZONTAL_RESULTS:
display_result_vertically= FALSE;
break;
- case Q_SORTED_RESULTS:
+ case Q_SORTED_RESULT:
/*
Turn on sorting of result set, will be reset after next
command
@@ -6370,7 +6370,7 @@ int main(int argc, char **argv)
*/
free_all_replace();
- /* Also reset "sorted_results" */
+ /* Also reset "sorted_result" */
display_result_sorted= FALSE;
}
last_command_executed= command_executed;